Adding overflow menu to media player

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

Index: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
index bf8c0459b928958e840e38807573a6dc315950ad..6179be1232eaee972e7f3220175e01e62c155953 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
@@ -300,6 +300,19 @@ void MediaControlMuteButtonElement::defaultEventHandler(Event* event)
 void MediaControlMuteButtonElement::updateDisplayType()
 {
     setDisplayType(mediaElement().muted() ? MediaUnMuteButton : MediaMuteButton);
+    updateOverflowString();

[liberato (no reviews please), 2016/09/01 18:05:19]

would it make sense to call this in setShouldShowButtonInOverflowMenu()?

not sure if it's functionally equivalent, but i also don't know that the
overflow menu is going to change much while it's shown.  i suppose that the
code, as written, would change 'play' to 'pause' if the video ended while the
overflow was shown.

whichever you think is best.

[kdsilva, 2016/09/05 14:39:35]

That works much better!

+}
+
+WebLocalizedString::Name MediaControlMuteButtonElement::getOverflowStringName()
+{
+    if (mediaElement().muted())
+        return WebLocalizedString::OverflowMenuUnmute;
+    return WebLocalizedString::OverflowMenuMute;
+}
+
+MediaControlInputElement* MediaControlMuteButtonElement::createOverflowButton(MediaControls& mediaControls)
+{
+    return MediaControlMuteButtonElement::create(mediaControls);
 }
 
 // ----------------------------
@@ -407,6 +420,8 @@ void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
 void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event* event)
 {
     if (event->type() == EventTypeNames::click) {
+        if (mediaControls().overflowMenuVisible())

[mlamouri (slow - plz ping), 2016/09/01 18:29:15]

Can you add a comment explaining why you are doing this. At first, I thought of
a mistake then realised what you are doing and I have some background about your
work :). Others might be confused.

[kdsilva, 2016/09/05 14:39:35]

Done.

+            mediaControls().toggleOverflowMenu();
         mediaControls().toggleTextTrackList();
         updateDisplayType();
         event->setDefaultHandled();
@@ -415,6 +430,16 @@ void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event* e
     HTMLInputElement::defaultEventHandler(event);
 }
 
+WebLocalizedString::Name MediaControlToggleClosedCaptionsButtonElement::getOverflowStringName()
+{
+    return WebLocalizedString::OverflowMenuCaptions;
+}
+
+MediaControlInputElement* MediaControlToggleClosedCaptionsButtonElement::createOverflowButton(MediaControls& mediaControls)
+{
+    return MediaControlToggleClosedCaptionsButtonElement::create(mediaControls);
+}
+
 // ----------------------------
 
 MediaControlTextTrackListElement::MediaControlTextTrackListElement(MediaControls& mediaControls)
@@ -554,6 +579,59 @@ void MediaControlTextTrackListElement::refreshTextTrackListMenu()
 }
 
 // ----------------------------
+MediaControlOverflowMenuButtonElement::MediaControlOverflowMenuButtonElement(MediaControls& mediaControls)
+    : MediaControlInputElement(mediaControls, MediaOverflowButton)
+{
+}
+
+MediaControlOverflowMenuButtonElement* MediaControlOverflowMenuButtonElement::create(MediaControls& mediaControls)
+{
+    MediaControlOverflowMenuButtonElement* button = new MediaControlOverflowMenuButtonElement(mediaControls);
+    button->ensureUserAgentShadowRoot();
+    button->setType(InputTypeNames::button);
+    button->setShadowPseudoId(AtomicString("-internal-overflow-menu-button"));
+    button->setIsWanted(false);
+    return button;
+}
+
+void MediaControlOverflowMenuButtonElement::defaultEventHandler(Event* event)
+{
+    if (event->type() == EventTypeNames::click) {
+        mediaControls().toggleOverflowMenu();
+        event->setDefaultHandled();
+    }
+
+    HTMLInputElement::defaultEventHandler(event);
+}
+
+// ----------------------------
+MediaControlOverflowMenuListElement::MediaControlOverflowMenuListElement(MediaControls& mediaControls)
+    : MediaControlDivElement(mediaControls, MediaOverflowList)
+{
+}
+
+MediaControlOverflowMenuListElement* MediaControlOverflowMenuListElement::create(MediaControls& mediaControls)
+{
+    MediaControlOverflowMenuListElement* element = new MediaControlOverflowMenuListElement(mediaControls);
+    element->setIsWanted(false);
+    element->setShadowPseudoId(AtomicString("-internal-media-controls-overflow-menu-list"));
+    return element;
+}
+
+void MediaControlOverflowMenuListElement::showOverflowMenu(bool visible)
+{
+    setIsWanted(visible);
+}
+
+void MediaControlOverflowMenuListElement::defaultEventHandler(Event* event)
+{
+    if (event->type() == EventTypeNames::click)
+        event->setDefaultHandled();
+
+    MediaControlDivElement::defaultEventHandler(event);
+}
+
+// ----------------------------
 
 MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaSlider)
@@ -738,6 +816,15 @@ void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen)
     setDisplayType(isFullscreen ? MediaExitFullscreenButton : MediaEnterFullscreenButton);
 }
 
+WebLocalizedString::Name MediaControlFullscreenButtonElement::getOverflowStringName()
+{
+    return WebLocalizedString::OverflowMenuFullscreen;
+}
+MediaControlInputElement* MediaControlFullscreenButtonElement::createOverflowButton(MediaControls& mediaControls)
+{
+    return MediaControlFullscreenButtonElement::create(mediaControls);
+}
+
 // ----------------------------
 
 MediaControlCastButtonElement::MediaControlCastButtonElement(MediaControls& mediaControls, bool isOverlayButton)
@@ -801,6 +888,13 @@ void MediaControlCastButtonElement::setIsPlayingRemotely(bool isPlayingRemotely)
     }
 }
 
+WebLocalizedString::Name MediaControlCastButtonElement::getOverflowStringName()
+{
+    if (mediaElement().isPlayingRemotely())
+        return WebLocalizedString::OverflowMenuStopCast;
+    return WebLocalizedString::OverflowMenuCast;
+}
+
 void MediaControlCastButtonElement::tryShowOverlay()
 {
     DCHECK(m_isOverlayButton);
@@ -830,6 +924,11 @@ void MediaControlCastButtonElement::recordMetrics(CastOverlayMetrics metric)
     overlayHistogram.count(static_cast<int>(metric));
 }
 
+MediaControlInputElement* MediaControlCastButtonElement::createOverflowButton(MediaControls& mediaControls)
+{
+    return MediaControlCastButtonElement::create(mediaControls, false);
+}
+
 // ----------------------------
 
 MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement(MediaControls& mediaControls)