Adding overflow menu to media player

third_party/WebKit/Source/core/html/shadow/MediaControls.cpp

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 8c0f1083541509794c61c292e4bc9b1401602d05..639242cad9fdaa1d88952373df192c68b6c034ca 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
@@ -42,6 +42,9 @@ namespace blink {
 // LayoutTests/media/media-controls.js.
 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
 
+// We only want to show the overflow menu if it contains at least two buttons
+static const int minOverflowMenuControlElementsNum = 2;
+
 static bool shouldShowFullscreenButton(const HTMLMediaElement& mediaElement)
 {
     // Unconditionally allow the user to exit fullscreen if we are in it
@@ -117,6 +120,11 @@ MediaControls::MediaControls(HTMLMediaElement& mediaElement)
     , m_volumeSlider(nullptr)
     , m_toggleClosedCaptionsButton(nullptr)
     , m_textTrackList(nullptr)
+    , m_overflowList(nullptr)
+    , m_muteOverflowButton(nullptr)
+    , m_castOverflowButton(nullptr)
+    , m_closedCaptionsOverflowButton(nullptr)
+    , m_fullscreenOverflowButton(nullptr)
     , m_castButton(nullptr)
     , m_fullScreenButton(nullptr)
     , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired)
@@ -242,6 +250,26 @@ void MediaControls::initializeControls()
     MediaControlTextTrackListElement* textTrackList = MediaControlTextTrackListElement::create(*this);
     m_textTrackList = textTrackList;
     appendChild(textTrackList);
+
+    MediaControlOverflowMenu* overflowMenu = MediaControlOverflowMenu::create(*this);
+    m_overflowMenu = overflowMenu;
+    panel->appendChild(overflowMenu);
+
+    MediaControlOverflowMenuListElement* overflowList = MediaControlOverflowMenuListElement::create(*this);
+    m_overflowList = overflowList;
+    appendChild(overflowList);
+
+    m_muteOverflowButton = MediaControlMuteButtonElement::create(*this);
+    m_castOverflowButton = MediaControlCastButtonElement::create(*this, false);
+    m_closedCaptionsOverflowButton = MediaControlToggleClosedCaptionsButtonElement::create(*this);
+    m_fullscreenOverflowButton = MediaControlFullscreenButtonElement::create(*this);
+
+    m_muteOverflowButton->setShadowPseudoId(AtomicString("-internal-media-controls-overflow-menu-list-item-element"));
+    m_castOverflowButton->setShadowPseudoId(AtomicString("-internal-media-controls-overflow-menu-list-item-element"));
+    m_closedCaptionsOverflowButton->setShadowPseudoId(AtomicString("-internal-media-controls-overflow-menu-list-item-element"));
+    m_fullscreenOverflowButton->setShadowPseudoId(AtomicString("-internal-media-controls-overflow-menu-list-item-element"));
+
+    controlsListOverflow = { m_muteOverflowButton, m_closedCaptionsOverflowButton, m_castOverflowButton, m_fullscreenOverflowButton };
 }
 
 void MediaControls::reset()
@@ -433,6 +461,8 @@ void MediaControls::updateCurrentTimeDisplay()
 void MediaControls::updateVolume()
 {
     m_muteButton->updateDisplayType();
+    m_muteOverflowButton->updateDisplayType();
+
     // Invalidate the mute button because it paints differently according to volume.
     invalidate(m_muteButton);
 
@@ -466,6 +496,7 @@ void MediaControls::updateVolume()
 void MediaControls::changedClosedCaptionsVisibility()
 {
     m_toggleClosedCaptionsButton->updateDisplayType();
+    m_closedCaptionsOverflowButton->updateDisplayType();
 }
 
 void MediaControls::refreshClosedCaptionsButtonVisibility()
@@ -730,6 +761,10 @@ void MediaControls::computeWhichControlsFit()
         return;
     }
 
+    // Controls that don't fit within the media player that could be included
+    // in an overflow menu.
+    std::set<MediaControlElementType> overflowControls;
+
     // For each control that fits, enable it in order of decreasing priority.
     bool droppedCastButton = false;
     for (MediaControlElement* element : elements) {
@@ -744,10 +779,21 @@ void MediaControls::computeWhichControlsFit()
                 element->setDoesFit(false);
                 if (element == m_castButton.get())
                     droppedCastButton = true;
+                overflowControls.insert(element->displayType());
             }
         }
     }
 
+    // We display an overflow menu only when we have at least two items
+    // within it.
+    if (overflowControls.size() >= minOverflowMenuControlElementsNum) {
+        m_overflowList->setOverflowMenuControls(&overflowControls);
+        m_overflowMenu->setIsWanted(true);
+    } else {
+        m_overflowMenu->setIsWanted(false);
+        m_overflowList->showOverflowMenu(false);
+    }
+
     // Special case for cast: if we want a cast button but dropped it, then
     // show the overlay cast button instead.
     if (m_castButton->isWanted()) {
@@ -784,6 +830,21 @@ void MediaControls::networkStateChanged()
     invalidate(m_volumeSlider);
 }
 
+bool MediaControls::overflowMenuVisible()
+{
+    return m_overflowList->isWanted();
+}
+
+void MediaControls::toggleOverflowMenu()
+{
+    m_overflowList->showOverflowMenu(!m_overflowList->isWanted());
+}
+
+std::vector<MediaControlInputElement*> MediaControls::getOverflowMenuButtons()
+{
+    return controlsListOverflow;
+}
+
 DEFINE_TRACE(MediaControls)
 {
     visitor->trace(m_mediaElement);
@@ -800,6 +861,12 @@ DEFINE_TRACE(MediaControls)
     visitor->trace(m_durationDisplay);
     visitor->trace(m_enclosure);
     visitor->trace(m_textTrackList);
+    visitor->trace(m_overflowMenu);
+    visitor->trace(m_overflowList);
+    visitor->trace(m_muteOverflowButton);
+    visitor->trace(m_castOverflowButton);
+    visitor->trace(m_closedCaptionsOverflowButton);
+    visitor->trace(m_fullscreenOverflowButton);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);