<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188612] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188612">188612</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-18 17:32:58 -0700 (Tue, 18 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove "platform text track menu"
https://bugs.webkit.org/show_bug.cgi?id=148139
Reviewed by Jer Noble.
Source/WebCore:
No new tests, this patch removes unused code.
* WebCore.xcodeproj/project.pbxproj: Remove PlatformTextTrackMenu.h.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::scheduleDelayedAction): Remove PLATFORM_TEXT_TRACK_MENU.
(WebCore::HTMLMediaElement::pendingActionTimerFired):
(WebCore::HTMLMediaElement::textTrackModeChanged):
(WebCore::HTMLMediaElement::mediaPlayerDidRemoveVideoTrack):
(WebCore::HTMLMediaElement::closeCaptionTracksChanged):
(WebCore::HTMLMediaElement::addAudioTrack):
(WebCore::HTMLMediaElement::clearMediaPlayer):
(WebCore::HTMLMediaElement::setSelectedTextTrack): Deleted.
(WebCore::HTMLMediaElement::platformTextTracks): Deleted.
(WebCore::HTMLMediaElement::notifyMediaPlayerOfTextTrackChanges): Deleted.
(WebCore::HTMLMediaElement::platformTextTrackMenu): Deleted.
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::player):
* html/track/InbandTextTrack.h:
* html/track/TextTrack.cpp:
(WebCore::TextTrack::hasCue):
(WebCore::TextTrack::isMainProgramContent):
(WebCore::TextTrack::platformTextTrack): Deleted.
* html/track/TextTrack.h:
(WebCore::TextTrack::create):
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::resetMediaEngines):
(WebCore::MediaPlayer::implementsTextTrackControls): Deleted.
(WebCore::MediaPlayer::textTrackMenu): Deleted.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::tracksChanged):
(WebCore::MediaPlayerPrivateInterface::simulateAudioInterruption):
(WebCore::MediaPlayerPrivateInterface::implementsTextTrackControls): Deleted.
(WebCore::MediaPlayerPrivateInterface::textTrackMenu): Deleted.
* platform/graphics/PlatformTextTrack.h:
* platform/graphics/PlatformTextTrackMenu.h: Removed.
Source/WTF:
* wtf/Platform.h: Remove PLATFORM_TEXT_TRACK_MENU.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandTextTrackh">trunk/Source/WebCore/html/track/InbandTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackcpp">trunk/Source/WebCore/html/track/TextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackh">trunk/Source/WebCore/html/track/TextTrack.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformTextTrackh">trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformTextTrackMenuh">trunk/Source/WebCore/platform/graphics/PlatformTextTrackMenu.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WTF/ChangeLog 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-08-18 Eric Carlson <eric.carlson@apple.com>
+
+ Remove "platform text track menu"
+ https://bugs.webkit.org/show_bug.cgi?id=148139
+
+ Reviewed by Jer Noble.
+
+ * wtf/Platform.h: Remove PLATFORM_TEXT_TRACK_MENU.
+
</ins><span class="cx"> 2015-08-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> WTF::Condition should have a fast path for notifyOne/notifyAll that avoids calling unparkOne/unparkAll
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WTF/wtf/Platform.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -1080,10 +1080,6 @@
</span><span class="cx"> #define HAVE_TIMINGDATAOPTIONS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#define USE_PLATFORM_TEXT_TRACK_MENU 1
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #define USE_AUDIO_SESSION 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/ChangeLog 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-08-18 Eric Carlson <eric.carlson@apple.com>
+
+ Remove "platform text track menu"
+ https://bugs.webkit.org/show_bug.cgi?id=148139
+
+ Reviewed by Jer Noble.
+
+ No new tests, this patch removes unused code.
+
+ * WebCore.xcodeproj/project.pbxproj: Remove PlatformTextTrackMenu.h.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::scheduleDelayedAction): Remove PLATFORM_TEXT_TRACK_MENU.
+ (WebCore::HTMLMediaElement::pendingActionTimerFired):
+ (WebCore::HTMLMediaElement::textTrackModeChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerDidRemoveVideoTrack):
+ (WebCore::HTMLMediaElement::closeCaptionTracksChanged):
+ (WebCore::HTMLMediaElement::addAudioTrack):
+ (WebCore::HTMLMediaElement::clearMediaPlayer):
+ (WebCore::HTMLMediaElement::setSelectedTextTrack): Deleted.
+ (WebCore::HTMLMediaElement::platformTextTracks): Deleted.
+ (WebCore::HTMLMediaElement::notifyMediaPlayerOfTextTrackChanges): Deleted.
+ (WebCore::HTMLMediaElement::platformTextTrackMenu): Deleted.
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::player):
+ * html/track/InbandTextTrack.h:
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::hasCue):
+ (WebCore::TextTrack::isMainProgramContent):
+ (WebCore::TextTrack::platformTextTrack): Deleted.
+ * html/track/TextTrack.h:
+ (WebCore::TextTrack::create):
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::resetMediaEngines):
+ (WebCore::MediaPlayer::implementsTextTrackControls): Deleted.
+ (WebCore::MediaPlayer::textTrackMenu): Deleted.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::tracksChanged):
+ (WebCore::MediaPlayerPrivateInterface::simulateAudioInterruption):
+ (WebCore::MediaPlayerPrivateInterface::implementsTextTrackControls): Deleted.
+ (WebCore::MediaPlayerPrivateInterface::textTrackMenu): Deleted.
+ * platform/graphics/PlatformTextTrack.h:
+ * platform/graphics/PlatformTextTrackMenu.h: Removed.
+
</ins><span class="cx"> 2015-08-18 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Search input results and clear icons are misaligned when padding is added
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -518,7 +518,6 @@
</span><span class="cx"> 0F6383DE18615B29003E5DB5 /* ThreadedScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6383DC18615B29003E5DB5 /* ThreadedScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F6A12BD1A00923700C6DE72 /* DebugPageOverlays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6A12BB1A00923700C6DE72 /* DebugPageOverlays.cpp */; };
</span><span class="cx"> 0F6A12BE1A00923700C6DE72 /* DebugPageOverlays.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6A12BC1A00923700C6DE72 /* DebugPageOverlays.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F7D07321884C45C00B4AF86 /* PlatformTextTrackMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F97A658155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */; };
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */; };
</span><span class="lines">@@ -7313,7 +7312,6 @@
</span><span class="cx"> 07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; };
</span><del>- 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrackMenu.h; sourceTree = "<group>"; };
</del><span class="cx"> 072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginReplacement.h; sourceTree = "<group>"; };
</span><span class="cx"> 072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickTimePluginReplacement.mm; sourceTree = "<group>"; };
</span><span class="cx"> 072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = QuickTimePluginReplacement.css; sourceTree = "<group>"; };
</span><span class="lines">@@ -21110,7 +21108,6 @@
</span><span class="cx"> 0562F9601573F88F0031CA16 /* PlatformLayer.h */,
</span><span class="cx"> CEEFCD7B19DB33DC003876D7 /* PlatformMediaResourceLoader.h */,
</span><span class="cx"> 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */,
</span><del>- 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */,
</del><span class="cx"> 074E82B818A69F0E007EF54C /* PlatformTimeRanges.cpp */,
</span><span class="cx"> 074E82B918A69F0E007EF54C /* PlatformTimeRanges.h */,
</span><span class="cx"> BCAB417F13E356E800D8AAF3 /* Region.cpp */,
</span><span class="lines">@@ -26305,7 +26302,6 @@
</span><span class="cx"> 297BE3D716C03C0E003316BD /* PlatformSpeechSynthesizer.h in Headers */,
</span><span class="cx"> 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */,
</span><span class="cx"> 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
</span><del>- 0F7D07321884C45C00B4AF86 /* PlatformTextTrackMenu.h in Headers */,
</del><span class="cx"> 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
</span><span class="cx"> 935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
</span><span class="cx"> 31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -137,10 +137,6 @@
</span><span class="cx"> #include "MediaKeys.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrack.h"
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> #include "JSMediaControlsHost.h"
</span><span class="cx"> #include "MediaControlsHost.h"
</span><span class="lines">@@ -803,11 +799,6 @@
</span><span class="cx"> setFlags(m_pendingActionFlags, ConfigureTextTracks);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (actionType & TextTrackChangesNotification)
- setFlags(m_pendingActionFlags, TextTrackChangesNotification);
-#endif
-
</del><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> if (actionType & CheckPlaybackTargetCompatablity)
</span><span class="cx"> setFlags(m_pendingActionFlags, CheckPlaybackTargetCompatablity);
</span><span class="lines">@@ -855,11 +846,6 @@
</span><span class="cx"> loadInternal();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled() && (m_pendingActionFlags & TextTrackChangesNotification))
- notifyMediaPlayerOfTextTrackChanges();
-#endif
-
</del><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> if (m_pendingActionFlags & CheckPlaybackTargetCompatablity && m_player && m_player->isCurrentPlaybackTargetWireless() && !m_player->canPlayToWirelessPlaybackTarget()) {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::pendingActionTimerFired(%p) - calling setShouldPlayToPlaybackTarget(false)", this);
</span><span class="lines">@@ -1667,11 +1653,6 @@
</span><span class="cx"> if (track->mode() != TextTrack::disabledKeyword() && trackIsLoaded)
</span><span class="cx"> textTrackAddCues(track, track->cues());
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (platformTextTrackMenu())
- platformTextTrackMenu()->trackWasSelected(track->platformTextTrack());
-#endif
-
</del><span class="cx"> configureTextTrackDisplay(AssumeTextTrackVisibilityChanged);
</span><span class="cx">
</span><span class="cx"> if (m_textTracks && m_textTracks->contains(track))
</span><span class="lines">@@ -3477,86 +3458,10 @@
</span><span class="cx"> prpTrack->willBeRemoved();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-void HTMLMediaElement::setSelectedTextTrack(PassRefPtr<PlatformTextTrack> platformTrack)
-{
- if (!m_textTracks)
- return;
-
- TrackDisplayUpdateScope scope(this);
-
- if (!platformTrack) {
- setSelectedTextTrack(TextTrack::captionMenuOffItem());
- return;
- }
-
- TextTrack* textTrack;
- if (platformTrack == PlatformTextTrack::captionMenuOffItem())
- textTrack = TextTrack::captionMenuOffItem();
- else if (platformTrack == PlatformTextTrack::captionMenuAutomaticItem())
- textTrack = TextTrack::captionMenuAutomaticItem();
- else {
- size_t i;
- for (i = 0; i < m_textTracks->length(); ++i) {
- textTrack = m_textTracks->item(i);
-
- if (textTrack->platformTextTrack() == platformTrack)
- break;
- }
- if (i == m_textTracks->length())
- return;
- }
-
- setSelectedTextTrack(textTrack);
-}
-
-Vector<RefPtr<PlatformTextTrack>> HTMLMediaElement::platformTextTracks()
-{
- if (!m_textTracks || !m_textTracks->length())
- return Vector<RefPtr<PlatformTextTrack>>();
-
- Vector<RefPtr<PlatformTextTrack>> platformTracks;
- for (size_t i = 0; i < m_textTracks->length(); ++i)
- platformTracks.append(m_textTracks->item(i)->platformTextTrack());
-
- return platformTracks;
-}
-
-void HTMLMediaElement::notifyMediaPlayerOfTextTrackChanges()
-{
- if (!m_textTracks || !m_textTracks->length() || !platformTextTrackMenu())
- return;
-
- m_platformMenu->tracksDidChange();
-}
-
-PlatformTextTrackMenuInterface* HTMLMediaElement::platformTextTrackMenu()
-{
- if (m_platformMenu)
- return m_platformMenu.get();
-
- if (!m_player || !m_player->implementsTextTrackControls())
- return 0;
-
- m_platformMenu = m_player->textTrackMenu();
- if (!m_platformMenu)
- return 0;
-
- m_platformMenu->setClient(this);
-
- return m_platformMenu.get();
-}
-#endif // #if USE(PLATFORM_TEXT_TRACK_MENU)
-
</del><span class="cx"> void HTMLMediaElement::closeCaptionTracksChanged()
</span><span class="cx"> {
</span><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->closedCaptionTracksChanged();
</span><del>-
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (m_player && m_player->implementsTextTrackControls())
- scheduleDelayedAction(TextTrackChangesNotification);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::addAudioTrack(PassRefPtr<AudioTrack> track)
</span><span class="lines">@@ -4925,13 +4830,6 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::clearMediaPlayer(%p) - flags = %x", this, (unsigned)flags);
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (platformTextTrackMenu()) {
- m_platformMenu->setClient(nullptr);
- m_platformMenu = nullptr;
- }
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> forgetResourceSpecificTracks();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -106,9 +106,6 @@
</span><span class="cx"> , private TextTrackClient
</span><span class="cx"> , private VideoTrackClient
</span><span class="cx"> #endif
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- , public PlatformTextTrackMenuClient
-#endif
</del><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> MediaPlayer* player() const { return m_player.get(); }
</span><span class="lines">@@ -304,12 +301,6 @@
</span><span class="cx"> virtual Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual void setSelectedTextTrack(PassRefPtr<PlatformTextTrack>) override;
- virtual Vector<RefPtr<PlatformTextTrack>> platformTextTracks() override;
- PlatformTextTrackMenuInterface* platformTextTrackMenu();
-#endif
-
</del><span class="cx"> struct TrackGroup;
</span><span class="cx"> void configureTextTrackGroupForLanguage(const TrackGroup&) const;
</span><span class="cx"> void configureTextTracks();
</span><span class="lines">@@ -943,10 +934,6 @@
</span><span class="cx"> RefPtr<MediaKeys> m_mediaKeys;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- RefPtr<PlatformTextTrackMenuInterface> m_platformMenu;
-#endif
-
</del><span class="cx"> std::unique_ptr<MediaElementSession> m_mediaSession;
</span><span class="cx"> PageActivityAssertionToken m_activityToken;
</span><span class="cx"> size_t m_reportedExtraMemoryCost;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandTextTrack.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/InbandTextTrack.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/html/track/InbandTextTrack.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -85,10 +85,6 @@
</span><span class="cx"> virtual void parseWebVTTCueData(InbandTextTrackPrivate*, const ISOWebVTTCue&) override { ASSERT_NOT_REACHED(); }
</span><span class="cx">
</span><span class="cx"> virtual MediaTime startTimeVariance() const override;
</span><del>-
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual InbandTextTrackPrivate* privateTrack() override { return m_private.get(); }
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.cpp 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -542,48 +542,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-PassRefPtr<PlatformTextTrack> TextTrack::platformTextTrack()
-{
- if (m_platformTextTrack)
- return m_platformTextTrack;
-
- PlatformTextTrack::TrackKind platformKind = PlatformTextTrack::Caption;
- if (kind() == subtitlesKeyword())
- platformKind = PlatformTextTrack::Subtitle;
- else if (kind() == captionsKeyword())
- platformKind = PlatformTextTrack::Caption;
- else if (kind() == descriptionsKeyword())
- platformKind = PlatformTextTrack::Description;
- else if (kind() == chaptersKeyword())
- platformKind = PlatformTextTrack::Chapter;
- else if (kind() == metadataKeyword())
- platformKind = PlatformTextTrack::MetaData;
- else if (kind() == forcedKeyword())
- platformKind = PlatformTextTrack::Forced;
-
- PlatformTextTrack::TrackType type = PlatformTextTrack::OutOfBand;
- if (m_trackType == TrackElement)
- type = PlatformTextTrack::OutOfBand;
- else if (m_trackType == AddTrack)
- type = PlatformTextTrack::Script;
- else if (m_trackType == InBand)
- type = PlatformTextTrack::InBand;
-
- PlatformTextTrack::TrackMode platformMode = PlatformTextTrack::Disabled;
- if (TextTrack::hiddenKeyword() == mode())
- platformMode = PlatformTextTrack::Hidden;
- else if (TextTrack::disabledKeyword() == mode())
- platformMode = PlatformTextTrack::Disabled;
- else if (TextTrack::showingKeyword() == mode())
- platformMode = PlatformTextTrack::Showing;
-
- m_platformTextTrack = PlatformTextTrack::create(this, label(), language(), platformMode, platformKind, type, uniqueId());
-
- return m_platformTextTrack;
-}
-#endif
-
</del><span class="cx"> bool TextTrack::isMainProgramContent() const
</span><span class="cx"> {
</span><span class="cx"> // "Main program" content is intrinsic to the presentation of the media file, regardless of locale. Content such as
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/html/track/TextTrack.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrack.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="lines">@@ -61,11 +57,7 @@
</span><span class="cx"> virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class TextTrack : public TrackBase, public EventTargetWithInlineData
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- , public PlatformTextTrackClient
-#endif
- {
</del><ins>+class TextTrack : public TrackBase, public EventTargetWithInlineData {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<TextTrack> create(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language)
</span><span class="cx"> {
</span><span class="lines">@@ -146,10 +138,6 @@
</span><span class="cx">
</span><span class="cx"> void removeAllCues();
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- PassRefPtr<PlatformTextTrack> platformTextTrack();
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> virtual void setLanguage(const AtomicString&) override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -179,12 +167,6 @@
</span><span class="cx"> RefPtr<VTTRegionList> m_regions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual TextTrack* publicTrack() override { return this; }
-
- RefPtr<PlatformTextTrack> m_platformTextTrack;
-#endif
-
</del><span class="cx"> TextTrackCueList* ensureTextTrackCueList();
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* m_scriptExecutionContext;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -1262,18 +1262,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-bool MediaPlayer::implementsTextTrackControls() const
-{
- return m_private->implementsTextTrackControls();
-}
-
-PassRefPtr<PlatformTextTrackMenuInterface> MediaPlayer::textTrackMenu()
-{
- return m_private->textTrackMenu();
-}
-#endif // USE(PLATFORM_TEXT_TRACK_MENU)
-
</del><span class="cx"> void MediaPlayer::resetMediaEngines()
</span><span class="cx"> {
</span><span class="cx"> mutableInstalledMediaEnginesVector().clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -53,10 +53,6 @@
</span><span class="cx"> #include "PlatformTextTrack.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrackMenu.h"
-#endif
-
</del><span class="cx"> OBJC_CLASS AVAsset;
</span><span class="cx"> OBJC_CLASS AVPlayer;
</span><span class="cx"> OBJC_CLASS NSArray;
</span><span class="lines">@@ -586,11 +582,6 @@
</span><span class="cx">
</span><span class="cx"> static void resetMediaEngines();
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- bool implementsTextTrackControls() const;
- PassRefPtr<PlatformTextTrackMenuInterface> textTrackMenu();
-#endif
-
</del><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx"> void simulateAudioInterruption();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -242,11 +242,6 @@
</span><span class="cx"> virtual void tracksChanged() { };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual bool implementsTextTrackControls() const { return false; }
- virtual PassRefPtr<PlatformTextTrackMenuInterface> textTrackMenu() { return 0; }
-#endif
-
</del><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx"> virtual void simulateAudioInterruption() { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef PlatformTextTrack_h
</span><span class="cx"> #define PlatformTextTrack_h
</span><span class="cx">
</span><del>-#if USE(PLATFORM_TEXT_TRACK_MENU) || ENABLE(AVF_CAPTIONS)
</del><ins>+#if ENABLE(AVF_CAPTIONS)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformTextTrackMenuh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/PlatformTextTrackMenu.h (188611 => 188612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformTextTrackMenu.h 2015-08-19 00:23:49 UTC (rev 188611)
+++ trunk/Source/WebCore/platform/graphics/PlatformTextTrackMenu.h 2015-08-19 00:32:58 UTC (rev 188612)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformTextTrackMenu_h
-#define PlatformTextTrackMenu_h
-
-#if USE(PLATFORM_TEXT_TRACK_MENU)
-
-#include "PlatformTextTrack.h"
-#include <wtf/Noncopyable.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class PlatformTextTrack;
-
-class PlatformTextTrackMenuClient {
-public:
- virtual ~PlatformTextTrackMenuClient() { }
-
- virtual void setSelectedTextTrack(PassRefPtr<PlatformTextTrack>) = 0;
- virtual Vector<RefPtr<PlatformTextTrack>> platformTextTracks() = 0;
-};
-
-class PlatformTextTrackMenuInterface : public RefCounted<PlatformTextTrackMenuInterface> {
-public:
- explicit PlatformTextTrackMenuInterface() { }
- virtual ~PlatformTextTrackMenuInterface() { }
-
- virtual void tracksDidChange() = 0;
- virtual void trackWasSelected(PassRefPtr<PlatformTextTrack>) = 0;
- virtual void setClient(PlatformTextTrackMenuClient*) = 0;
-};
-
-}
-
-#endif // USE(PLATFORM_TEXT_TRACK_MENU)
-#endif // PlatformTextTrackMenu_h
</del></span></pre>
</div>
</div>
</body>
</html>