Close the media controls overflow menu when an item is selected.

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

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google 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.
@@ skipping 277 matching lines @@
     if (event->type() == EventTypeNames::click) {
         if (mediaElement().muted())
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.Unmute"));
         else
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.Mute"));
 
         mediaElement().setMuted(!mediaElement().muted());
         event->setDefaultHandled();
     }
 
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 void MediaControlMuteButtonElement::updateDisplayType()
 {
     setDisplayType(mediaElement().muted() ? MediaUnMuteButton : MediaMuteButton);
     updateOverflowString();
 }
 
 WebLocalizedString::Name MediaControlMuteButtonElement::getOverflowStringName()
 {
@@ skipping 29 matching lines @@
         // Allow play attempts for plain src= media to force a reload in the error state. This allows potential
         // recovery for transient network and decoder resource issues.
         const String& url = mediaElement().currentSrc().getString();
         if (mediaElement().error() && !HTMLMediaElement::isMediaStreamURL(url) && !HTMLMediaSource::lookup(url))
             mediaElement().load();
 
         mediaElement().togglePlayState();
         updateDisplayType();
         event->setDefaultHandled();
     }
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 void MediaControlPlayButtonElement::updateDisplayType()
 {
     setDisplayType(mediaElement().paused() ? MediaPlayButton : MediaPauseButton);
     updateOverflowString();
 }
 
 WebLocalizedString::Name MediaControlPlayButtonElement::getOverflowStringName()
 {
@@ skipping 58 matching lines @@
 
 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
 {
     bool captionsVisible = mediaElement().textTracksVisible();
     setDisplayType(captionsVisible ? MediaHideClosedCaptionsButton : MediaShowClosedCaptionsButton);
 }
 
 void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event* event)
 {
     if (event->type() == EventTypeNames::click) {
-        // If the user opens up the closed captions menu from the overfow menu,
-        // the overflow menu should no longer be visible.
-        if (mediaControls().overflowMenuVisible())
-            mediaControls().toggleOverflowMenu();
         mediaControls().toggleTextTrackList();
         updateDisplayType();
         event->setDefaultHandled();
     }
 
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 WebLocalizedString::Name MediaControlToggleClosedCaptionsButtonElement::getOverflowStringName()
 {
     return WebLocalizedString::OverflowMenuCaptions;
 }
 
 // ----------------------------
 
 MediaControlTextTrackListElement::MediaControlTextTrackListElement(MediaControls& mediaControls)
@@ skipping 153 matching lines @@
     if (event->type() == EventTypeNames::click) {
         if (mediaControls().overflowMenuVisible())
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.OverflowClose"));
         else
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.OverflowOpen"));
 
         mediaControls().toggleOverflowMenu();
         event->setDefaultHandled();
     }
 
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 // ----------------------------
 MediaControlOverflowMenuListElement::MediaControlOverflowMenuListElement(MediaControls& mediaControls)
     : MediaControlDivElement(mediaControls, MediaOverflowList)
 {
 }
 
 MediaControlOverflowMenuListElement* MediaControlOverflowMenuListElement::create(MediaControls& mediaControls)
 {
@@ skipping 234 matching lines @@
     if (event->type() == EventTypeNames::click) {
         if (mediaElement().isFullscreen()) {
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.ExitFullscreen"));
             mediaElement().exitFullscreen();
         } else {
             Platform::current()->recordAction(UserMetricsAction("Media.Controls.EnterFullscreen"));
             mediaElement().enterFullscreen();
         }
         event->setDefaultHandled();
     }
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen)
 {
     setDisplayType(isFullscreen ? MediaExitFullscreenButton : MediaEnterFullscreenButton);
 }
 
 WebLocalizedString::Name MediaControlFullscreenButtonElement::getOverflowStringName()
 {
     if (mediaElement().isFullscreen())
@@ skipping 30 matching lines @@
         if (m_isOverlayButton && !m_clickUseCounted) {
             m_clickUseCounted = true;
             recordMetrics(CastOverlayMetrics::Clicked);
         }
         if (mediaElement().isPlayingRemotely()) {
             mediaElement().requestRemotePlaybackControl();
         } else {
             mediaElement().requestRemotePlayback();
         }
     }
-    HTMLInputElement::defaultEventHandler(event);
+    MediaControlInputElement::defaultEventHandler(event);
 }
 
 const AtomicString& MediaControlCastButtonElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id_nonOverlay, ("-internal-media-controls-cast-button"));
     DEFINE_STATIC_LOCAL(AtomicString, id_overlay, ("-internal-media-controls-overlay-cast-button"));
     return m_isOverlayButton ? id_overlay : id_nonOverlay;
 }
 
 void MediaControlCastButtonElement::setIsPlayingRemotely(bool isPlayingRemotely)
@@ skipping 72 matching lines @@
 }
 
 MediaControlCurrentTimeDisplayElement* MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls)
 {
     MediaControlCurrentTimeDisplayElement* element = new MediaControlCurrentTimeDisplayElement(mediaControls);
     element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time-display"));
     return element;
 }
 
 } // namespace blink