Index: third_party/WebKit/Source/core/html/shadow/MediaControls.cpp |
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp |
index e78e237e5fd378fe3dd1430bdd455906ad4f9cad..5b5425e74778df6daac38fd15f1737564a00f962 100644 |
--- a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp |
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp |
@@ -112,6 +112,7 @@ MediaControls::MediaControls(HTMLMediaElement& mediaElement) |
, m_muteButton(nullptr) |
, m_volumeSlider(nullptr) |
, m_toggleClosedCaptionsButton(nullptr) |
+ , m_textTrackList(nullptr) |
, m_castButton(nullptr) |
, m_fullScreenButton(nullptr) |
, m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired) |
@@ -151,6 +152,11 @@ PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& me |
// +-MediaControlMuteButtonElement (-webkit-media-controls-mute-button) |
// +-MediaControlVolumeSliderElement (-webkit-media-controls-volume-slider) |
// +-MediaControlToggleClosedCaptionsButtonElement (-webkit-media-controls-toggle-closed-captions-button) |
+// +-MediaControlTextTrackListElement (-internal-media-controls-text-track-list) |
+// \-MediaControlTextTrackListItem (-internal-media-controls-text-track-list-item) |
+// +-MediaControlTextTrackListItemInput (-internal-media-controls-text-track-list-item-input) |
+// +-MediaControlTextTrackListItemCaptions (-internal-media-controls-text-track-list-kind-captions) |
+// +-MediaControlTextTrackListItemSubtitles (-internal-media-controls-text-track-list-kind-subtitles) |
// +-MediaControlCastButtonElement (-internal-media-controls-cast-button) |
// \-MediaControlFullscreenButtonElement (-webkit-media-controls-fullscreen-button) |
void MediaControls::initializeControls() |
@@ -225,6 +231,10 @@ void MediaControls::initializeControls() |
m_panel = panel.get(); |
enclosure->appendChild(panel.release()); |
+ RefPtrWillBeRawPtr<MediaControlTextTrackListElement> textTrackList = MediaControlTextTrackListElement::create(*this); |
+ m_textTrackList = textTrackList.get(); |
+ enclosure->appendChild(textTrackList.release()); |
+ |
m_enclosure = enclosure.get(); |
appendChild(enclosure.release()); |
} |
@@ -451,6 +461,19 @@ void MediaControls::refreshClosedCaptionsButtonVisibility() |
BatchedControlUpdate batch(this); |
} |
+void MediaControls::toggleTextTrackList() |
+{ |
+ if (!mediaElement().hasClosedCaptions()) |
+ return; |
+ |
+ if (!m_textTrackList->isHidden()) { |
+ m_textTrackList->displayTextTrackList(false); |
+ } else { |
+ m_textTrackList->refreshTextTrackListMenu(); |
+ m_textTrackList->displayTextTrackList(true); |
+ } |
+} |
+ |
void MediaControls::refreshCastButtonVisibility() |
{ |
refreshCastButtonVisibilityWithoutUpdate(); |
@@ -750,6 +773,7 @@ DEFINE_TRACE(MediaControls) |
visitor->trace(m_fullScreenButton); |
visitor->trace(m_durationDisplay); |
visitor->trace(m_enclosure); |
+ visitor->trace(m_textTrackList); |
visitor->trace(m_castButton); |
visitor->trace(m_overlayCastButton); |
HTMLDivElement::trace(visitor); |