Media Controls: delegate 'volumechange' and 'focusin' handling to an EventListener.

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

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  */
 
 #include "core/html/shadow/MediaControls.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/Fullscreen.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
+#include "core/html/shadow/MediaControlsMediaEventListener.h"
 #include "core/html/shadow/MediaControlsWindowEventListener.h"
 #include "core/html/track/TextTrackContainer.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTheme.h"
 #include "platform/EventDispatchForbiddenScope.h"
 
 namespace blink {
 
 // If you change this value, then also update the corresponding value in
@@ skipping 70 matching lines @@
       m_currentTimeDisplay(nullptr),
       m_durationDisplay(nullptr),
       m_muteButton(nullptr),
       m_volumeSlider(nullptr),
       m_toggleClosedCaptionsButton(nullptr),
       m_textTrackList(nullptr),
       m_overflowList(nullptr),
       m_castButton(nullptr),
       m_fullscreenButton(nullptr),
       m_downloadButton(nullptr),
+      m_mediaEventListener(new MediaControlsMediaEventListener(this)),
       m_windowEventListener(MediaControlsWindowEventListener::create(
           this,
           WTF::bind(&MediaControls::hideAllMenus, wrapWeakPersistent(this)))),
       m_hideMediaControlsTimer(this,
                                &MediaControls::hideMediaControlsTimerFired),
       m_hideTimerBehaviorFlags(IgnoreNone),
       m_isMouseOverControls(false),
       m_isPausedForScrubbing(false),
       m_panelWidthChangedTimer(this,
                                &MediaControls::panelWidthChangedTimerFired),
@@ skipping 194 matching lines @@
   if (mediaElement().error())
     mediaElement().pause();
 
   updatePlayState();
 
   updateCurrentTimeDisplay();
 
   m_timeline->setDuration(duration);
   m_timeline->setPosition(mediaElement().currentTime());
 
-  updateVolume();
+  onVolumeChange();
 
   refreshClosedCaptionsButtonVisibility();
 
   m_fullscreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement()));
 
   refreshCastButtonVisibilityWithoutUpdate();
 
   m_downloadButton->setIsWanted(
       m_downloadButton->shouldDisplayDownloadButton());
 }
 
 LayoutObject* MediaControls::layoutObjectForTextTrackLayout() {
   return m_panel->layoutObject();
 }
 
 void MediaControls::show() {
   makeOpaque();
   m_panel->setIsWanted(true);
   m_panel->setIsDisplayed(true);
   if (m_overlayPlayButton)
     m_overlayPlayButton->updateDisplayType();
 }
 
-void MediaControls::mediaElementFocused() {
-  if (mediaElement().shouldShowControls()) {
-    show();
-    resetHideMediaControlsTimer();
-  }
-}
-
 void MediaControls::hide() {
   m_panel->setIsWanted(false);
   m_panel->setIsDisplayed(false);
   if (m_overlayPlayButton)
     m_overlayPlayButton->setIsWanted(false);
 }
 
 bool MediaControls::isVisible() const {
   return m_panel->isOpaque();
 }
@@ skipping 98 matching lines @@
   double now = mediaElement().currentTime();
   double duration = mediaElement().duration();
 
   // Allow the theme to format the time.
   m_currentTimeDisplay->setInnerText(
       LayoutTheme::theme().formatMediaControlsCurrentTime(now, duration),
       IGNORE_EXCEPTION);
   m_currentTimeDisplay->setCurrentValue(now);
 }
 
-void MediaControls::updateVolume() {
-  m_muteButton->updateDisplayType();
-  // Invalidate the mute button because it paints differently according to
-  // volume.
-  invalidate(m_muteButton);
-
-  if (mediaElement().muted())
-    m_volumeSlider->setVolume(0);
-  else
-    m_volumeSlider->setVolume(mediaElement().volume());
-
-  // Update the visibility of our audio elements.
-  // We never want the volume slider if there's no audio.
-  // If there is audio, then we want it unless we prefer to hide it.
-  BatchedControlUpdate batch(this);
-  m_volumeSlider->setIsWanted(mediaElement().hasAudio() &&
-                              !preferHiddenVolumeControls(document()));
-
-  // If there is no audio track, then hide the mute button.
-  m_muteButton->setIsWanted(mediaElement().hasAudio());
-
-  // Invalidate the volume slider because it paints differently according to
-  // volume.
-  invalidate(m_volumeSlider);
-}
-
 void MediaControls::changedClosedCaptionsVisibility() {
   m_toggleClosedCaptionsButton->updateDisplayType();
 }
 
 void MediaControls::refreshClosedCaptionsButtonVisibility() {
   m_toggleClosedCaptionsButton->setIsWanted(mediaElement().hasClosedCaptions());
   BatchedControlUpdate batch(this);
 }
 
 void MediaControls::toggleTextTrackList() {
@@ skipping 196 matching lines @@
 
 bool MediaControls::containsRelatedTarget(Event* event) {
   if (!event->isMouseEvent())
     return false;
   EventTarget* relatedTarget = toMouseEvent(event)->relatedTarget();
   if (!relatedTarget)
     return false;
   return contains(relatedTarget->toNode());
 }
 
+void MediaControls::onVolumeChange() {
+  m_muteButton->updateDisplayType();
+  m_volumeSlider->setVolume(mediaElement().muted() ? 0
+                                                   : mediaElement().volume());
+
+  // Update visibility of volume controls.
+  // TODO(mlamouri): it should not be part of the volumechange handling because
+  // it is using audio availability as input.
+  BatchedControlUpdate batch(this);
+  m_volumeSlider->setIsWanted(mediaElement().hasAudio() &&
+                              !preferHiddenVolumeControls(document()));
+  m_muteButton->setIsWanted(mediaElement().hasAudio());
+}
+
+void MediaControls::onFocusIn() {
+  if (!mediaElement().shouldShowControls())
+    return;
+
+  show();
+  resetHideMediaControlsTimer();
+}
+
 void MediaControls::notifyPanelWidthChanged(const LayoutUnit& newWidth) {
   // Don't bother to do any work if this matches the most recent panel
   // width, since we're called after layout.
   // Note that this code permits a bad frame on resize, since it is
   // run after the relayout / paint happens.  It would be great to improve
   // this, but it would be even greater to move this code entirely to
   // JS and fix it there.
   m_panelWidth = newWidth.toInt();
 
   // Adjust for effective zoom.
@@ skipping 171 matching lines @@
   visitor->trace(m_toggleClosedCaptionsButton);
   visitor->trace(m_fullscreenButton);
   visitor->trace(m_downloadButton);
   visitor->trace(m_durationDisplay);
   visitor->trace(m_enclosure);
   visitor->trace(m_textTrackList);
   visitor->trace(m_overflowMenu);
   visitor->trace(m_overflowList);
   visitor->trace(m_castButton);
   visitor->trace(m_overlayCastButton);
+  visitor->trace(m_mediaEventListener);
   visitor->trace(m_windowEventListener);
   HTMLDivElement::trace(visitor);
 }
 
 }  // namespace blink