Diff
Modified: trunk/Source/WTF/ChangeLog (188611 => 188612)
--- 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)
@@ -1,3 +1,12 @@
+2015-08-18 Eric Carlson <eric.carl...@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.
+
2015-08-18 Filip Pizlo <fpi...@apple.com>
WTF::Condition should have a fast path for notifyOne/notifyAll that avoids calling unparkOne/unparkAll
Modified: trunk/Source/WTF/wtf/Platform.h (188611 => 188612)
--- 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)
@@ -1080,10 +1080,6 @@
#define HAVE_TIMINGDATAOPTIONS 1
#endif
-#if PLATFORM(IOS)
-#define USE_PLATFORM_TEXT_TRACK_MENU 1
-#endif
-
#if PLATFORM(COCOA)
#define USE_AUDIO_SESSION 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (188611 => 188612)
--- 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)
@@ -1,3 +1,47 @@
+2015-08-18 Eric Carlson <eric.carl...@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.
+
2015-08-18 Wenson Hsieh <wenson_hs...@apple.com>
Search input results and clear icons are misaligned when padding is added
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188611 => 188612)
--- 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)
@@ -518,7 +518,6 @@
0F6383DE18615B29003E5DB5 /* ThreadedScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6383DC18615B29003E5DB5 /* ThreadedScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F6A12BD1A00923700C6DE72 /* DebugPageOverlays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6A12BB1A00923700C6DE72 /* DebugPageOverlays.cpp */; };
0F6A12BE1A00923700C6DE72 /* DebugPageOverlays.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6A12BC1A00923700C6DE72 /* DebugPageOverlays.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0F7D07321884C45C00B4AF86 /* PlatformTextTrackMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F97A658155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */; };
0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */; };
@@ -7313,7 +7312,6 @@
07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackEvent.cpp; sourceTree = "<group>"; };
07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackEvent.h; sourceTree = "<group>"; };
072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; };
- 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrackMenu.h; sourceTree = "<group>"; };
072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginReplacement.h; sourceTree = "<group>"; };
072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickTimePluginReplacement.mm; sourceTree = "<group>"; };
072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = QuickTimePluginReplacement.css; sourceTree = "<group>"; };
@@ -21110,7 +21108,6 @@
0562F9601573F88F0031CA16 /* PlatformLayer.h */,
CEEFCD7B19DB33DC003876D7 /* PlatformMediaResourceLoader.h */,
072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */,
- 072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */,
074E82B818A69F0E007EF54C /* PlatformTimeRanges.cpp */,
074E82B918A69F0E007EF54C /* PlatformTimeRanges.h */,
BCAB417F13E356E800D8AAF3 /* Region.cpp */,
@@ -26305,7 +26302,6 @@
297BE3D716C03C0E003316BD /* PlatformSpeechSynthesizer.h in Headers */,
1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */,
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
- 0F7D07321884C45C00B4AF86 /* PlatformTextTrackMenu.h in Headers */,
074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */,
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188611 => 188612)
--- 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)
@@ -137,10 +137,6 @@
#include "MediaKeys.h"
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrack.h"
-#endif
-
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
#include "JSMediaControlsHost.h"
#include "MediaControlsHost.h"
@@ -803,11 +799,6 @@
setFlags(m_pendingActionFlags, ConfigureTextTracks);
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (actionType & TextTrackChangesNotification)
- setFlags(m_pendingActionFlags, TextTrackChangesNotification);
-#endif
-
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
if (actionType & CheckPlaybackTargetCompatablity)
setFlags(m_pendingActionFlags, CheckPlaybackTargetCompatablity);
@@ -855,11 +846,6 @@
loadInternal();
}
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled() && (m_pendingActionFlags & TextTrackChangesNotification))
- notifyMediaPlayerOfTextTrackChanges();
-#endif
-
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
if (m_pendingActionFlags & CheckPlaybackTargetCompatablity && m_player && m_player->isCurrentPlaybackTargetWireless() && !m_player->canPlayToWirelessPlaybackTarget()) {
LOG(Media, "HTMLMediaElement::pendingActionTimerFired(%p) - calling setShouldPlayToPlaybackTarget(false)", this);
@@ -1667,11 +1653,6 @@
if (track->mode() != TextTrack::disabledKeyword() && trackIsLoaded)
textTrackAddCues(track, track->cues());
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (platformTextTrackMenu())
- platformTextTrackMenu()->trackWasSelected(track->platformTextTrack());
-#endif
-
configureTextTrackDisplay(AssumeTextTrackVisibilityChanged);
if (m_textTracks && m_textTracks->contains(track))
@@ -3477,86 +3458,10 @@
prpTrack->willBeRemoved();
}
-#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)
-
void HTMLMediaElement::closeCaptionTracksChanged()
{
if (hasMediaControls())
mediaControls()->closedCaptionTracksChanged();
-
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (m_player && m_player->implementsTextTrackControls())
- scheduleDelayedAction(TextTrackChangesNotification);
-#endif
}
void HTMLMediaElement::addAudioTrack(PassRefPtr<AudioTrack> track)
@@ -4925,13 +4830,6 @@
{
LOG(Media, "HTMLMediaElement::clearMediaPlayer(%p) - flags = %x", this, (unsigned)flags);
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- if (platformTextTrackMenu()) {
- m_platformMenu->setClient(nullptr);
- m_platformMenu = nullptr;
- }
-#endif
-
#if ENABLE(VIDEO_TRACK)
forgetResourceSpecificTracks();
#endif
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (188611 => 188612)
--- 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)
@@ -106,9 +106,6 @@
, private TextTrackClient
, private VideoTrackClient
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- , public PlatformTextTrackMenuClient
-#endif
{
public:
MediaPlayer* player() const { return m_player.get(); }
@@ -304,12 +301,6 @@
virtual Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() override;
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual void setSelectedTextTrack(PassRefPtr<PlatformTextTrack>) override;
- virtual Vector<RefPtr<PlatformTextTrack>> platformTextTracks() override;
- PlatformTextTrackMenuInterface* platformTextTrackMenu();
-#endif
-
struct TrackGroup;
void configureTextTrackGroupForLanguage(const TrackGroup&) const;
void configureTextTracks();
@@ -943,10 +934,6 @@
RefPtr<MediaKeys> m_mediaKeys;
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- RefPtr<PlatformTextTrackMenuInterface> m_platformMenu;
-#endif
-
std::unique_ptr<MediaElementSession> m_mediaSession;
PageActivityAssertionToken m_activityToken;
size_t m_reportedExtraMemoryCost;
Modified: trunk/Source/WebCore/html/track/InbandTextTrack.h (188611 => 188612)
--- 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)
@@ -85,10 +85,6 @@
virtual void parseWebVTTCueData(InbandTextTrackPrivate*, const ISOWebVTTCue&) override { ASSERT_NOT_REACHED(); }
virtual MediaTime startTimeVariance() const override;
-
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual InbandTextTrackPrivate* privateTrack() override { return m_private.get(); }
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (188611 => 188612)
--- 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)
@@ -542,48 +542,6 @@
return false;
}
-#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
-
bool TextTrack::isMainProgramContent() const
{
// "Main program" content is intrinsic to the presentation of the media file, regardless of locale. Content such as
Modified: trunk/Source/WebCore/html/track/TextTrack.h (188611 => 188612)
--- 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)
@@ -36,10 +36,6 @@
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrack.h"
-#endif
-
namespace WebCore {
class ScriptExecutionContext;
@@ -61,11 +57,7 @@
virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
};
-class TextTrack : public TrackBase, public EventTargetWithInlineData
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- , public PlatformTextTrackClient
-#endif
- {
+class TextTrack : public TrackBase, public EventTargetWithInlineData {
public:
static Ref<TextTrack> create(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language)
{
@@ -146,10 +138,6 @@
void removeAllCues();
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- PassRefPtr<PlatformTextTrack> platformTextTrack();
-#endif
-
#if ENABLE(MEDIA_SOURCE)
virtual void setLanguage(const AtomicString&) override;
#endif
@@ -179,12 +167,6 @@
RefPtr<VTTRegionList> m_regions;
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual TextTrack* publicTrack() override { return this; }
-
- RefPtr<PlatformTextTrack> m_platformTextTrack;
-#endif
-
TextTrackCueList* ensureTextTrackCueList();
ScriptExecutionContext* m_scriptExecutionContext;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (188611 => 188612)
--- 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)
@@ -1262,18 +1262,6 @@
#endif // ENABLE(VIDEO_TRACK)
-#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)
-
void MediaPlayer::resetMediaEngines()
{
mutableInstalledMediaEnginesVector().clear();
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (188611 => 188612)
--- 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)
@@ -53,10 +53,6 @@
#include "PlatformTextTrack.h"
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
-#include "PlatformTextTrackMenu.h"
-#endif
-
OBJC_CLASS AVAsset;
OBJC_CLASS AVPlayer;
OBJC_CLASS NSArray;
@@ -586,11 +582,6 @@
static void resetMediaEngines();
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- bool implementsTextTrackControls() const;
- PassRefPtr<PlatformTextTrackMenuInterface> textTrackMenu();
-#endif
-
#if USE(GSTREAMER)
void simulateAudioInterruption();
#endif
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (188611 => 188612)
--- 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)
@@ -242,11 +242,6 @@
virtual void tracksChanged() { };
#endif
-#if USE(PLATFORM_TEXT_TRACK_MENU)
- virtual bool implementsTextTrackControls() const { return false; }
- virtual PassRefPtr<PlatformTextTrackMenuInterface> textTrackMenu() { return 0; }
-#endif
-
#if USE(GSTREAMER)
virtual void simulateAudioInterruption() { }
#endif
Modified: trunk/Source/WebCore/platform/graphics/PlatformTextTrack.h (188611 => 188612)
--- 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)
@@ -26,7 +26,7 @@
#ifndef PlatformTextTrack_h
#define PlatformTextTrack_h
-#if USE(PLATFORM_TEXT_TRACK_MENU) || ENABLE(AVF_CAPTIONS)
+#if ENABLE(AVF_CAPTIONS)
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
Deleted: trunk/Source/WebCore/platform/graphics/PlatformTextTrackMenu.h (188611 => 188612)
--- 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)
@@ -1,60 +0,0 @@
-/*
- * 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
