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

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 1072 matching lines @@
   startProgressEventTimer();
 
   // Reset display mode to force a recalculation of what to show because we are
   // resetting the player.
   setDisplayMode(Unknown);
 
   setPlayerPreload();
 
   if (fastHasAttribute(mutedAttr))
     m_muted = true;
-  updateVolume();

[mlamouri (slow - plz ping), 2016/11/07 00:26:05]

FYI, I couldn't find what that was for. I did some manual tests and everything
is fine. If there are no automated tests failing and you have no idea why that
was here, I would be in favour of removing.

[foolip, 2016/11/08 10:28:29]

https://chromium.googlesource.com/chromium/src/+/1f8312e78f2cb0b629dac384ae2b...
doesn't provide much of a clue, except that it came before the muted content
attribute.

If you remove this and use the content attribute, is there another call to
updateVolume() somewhere? Seem like without it things would go wrong.

[mlamouri (slow - plz ping), 2016/11/11 05:29:17]

I've added a test for this. It sounds fine. Let me know if I missed something.

[foolip, 2016/11/11 09:50:20]

Do you know why it works? It could be kind of accidental and therefore fragile.
The test should catch any regression, but understanding is nice, and I don't :)

[mlamouri (slow - plz ping), 2016/11/13 06:15:11]

That's because when readyState is changed, HTMLMediaElement calls reset() on the
MediaControls. Something to keep track of when using events for state change
listening but the test will help ;)

[foolip, 2016/11/14 16:07:37]

OK, since there's no volumechange event for this I guess it's fair that the
controls have to live by the same rules. Really the problem is that the muted
attribute should only be consulted once when the element is created, but it's
hard: https://crbug.com/350303

 
   DCHECK(!m_mediaSource);
 
   bool attemptLoad = true;
 
   m_mediaSource = HTMLMediaSource::lookup(url.getString());
   if (m_mediaSource && !m_mediaSource->attachToElement(this)) {
     // Forget our reference to the MediaSource, so we leave it alone
     // while processing remainder of load failure.
     m_mediaSource = nullptr;
@@ skipping 1308 matching lines @@
   if (vol < 0.0f || vol > 1.0f) {
     exceptionState.throwDOMException(
         IndexSizeError,
         ExceptionMessages::indexOutsideRange(
             "volume", vol, 0.0, ExceptionMessages::InclusiveBound, 1.0,
             ExceptionMessages::InclusiveBound));
     return;
   }
 
   m_volume = vol;
-  updateVolume();
+
+  if (webMediaPlayer())
+    webMediaPlayer()->setVolume(effectiveMediaVolume());
   scheduleEvent(EventTypeNames::volumechange);
 }
 
 bool HTMLMediaElement::muted() const {
   return m_muted;
 }
 
 void HTMLMediaElement::setMuted(bool muted) {
   BLINK_MEDIA_LOG << "setMuted(" << (void*)this << ", " << boolString(muted)
                   << ")";
@@ skipping 21 matching lines @@
       m_autoplayUmaHelper->recordAutoplayUnmuteStatus(
           AutoplayUnmuteActionStatus::Failure);
     } else {
       m_autoplayUmaHelper->recordAutoplayUnmuteStatus(
           AutoplayUnmuteActionStatus::Success);
     }
   }
 
   // This is called after the volumechange event to make sure isAutoplayingMuted
   // returns the right value when webMediaPlayer receives the volume update.
-  updateVolume();
+  if (webMediaPlayer())
+    webMediaPlayer()->setVolume(effectiveMediaVolume());
 
   // If an element was a candidate for autoplay muted but not visible, it will
   // have a visibility observer ready to start its playback.
   if (wasPendingAutoplayMuted) {
     m_autoplayVisibilityObserver->stop();
     m_autoplayVisibilityObserver = nullptr;
   }
 }
 
-void HTMLMediaElement::updateVolume() {
-  if (webMediaPlayer())
-    webMediaPlayer()->setVolume(effectiveMediaVolume());
-
-  if (mediaControls())
-    mediaControls()->updateVolume();
-}
-
 double HTMLMediaElement::effectiveMediaVolume() const {
   if (m_muted)
     return 0;
 
   return m_volume;
 }
 
 // The spec says to fire periodic timeupdate events (those sent while playing)
 // every "15 to 250ms", we choose the slowest frequency
 static const double maxTimeupdateEventFrequency = 0.25;
@@ skipping 828 matching lines @@
                   << ", isPlaying = " << boolString(isPlaying);
 
   if (shouldBePlaying) {
     setDisplayMode(Video);
 
     if (!isPlaying) {
       // Set rate, muted before calling play in case they were set before the
       // media engine was setup.  The media engine should just stash the rate
       // and muted values since it isn't already playing.
       webMediaPlayer()->setRate(playbackRate());
-      updateVolume();
+      webMediaPlayer()->setVolume(effectiveMediaVolume());
       webMediaPlayer()->play();
       m_autoplayHelper->playbackStarted();
     }
 
     if (mediaControls())
       mediaControls()->playbackStarted();
     startPlaybackProgressTimer();
     m_playing = true;
 
   } else {  // Should not be playing right now
@@ skipping 453 matching lines @@
 
 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) {
   setShouldDelayLoadEvent(false);
   m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource));
 }
 
 bool HTMLMediaElement::isInteractiveContent() const {
   return fastHasAttribute(controlsAttr);
 }
 
-void HTMLMediaElement::defaultEventHandler(Event* event) {
-  if (event->type() == EventTypeNames::focusin) {
-    if (mediaControls())
-      mediaControls()->mediaElementFocused();
-  }
-  HTMLElement::defaultEventHandler(event);
-}
-
 DEFINE_TRACE(HTMLMediaElement) {
   visitor->trace(m_playedTimeRanges);
   visitor->trace(m_asyncEventQueue);
   visitor->trace(m_error);
   visitor->trace(m_currentSourceNode);
   visitor->trace(m_nextChildNodeToConsider);
   visitor->trace(m_mediaSource);
   visitor->trace(m_audioTracks);
   visitor->trace(m_videoTracks);
   visitor->trace(m_cueTimeline);
@@ skipping 356 matching lines @@
 
 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect()
     const {
   IntRect result;
   if (LayoutObject* object = m_element->layoutObject())
     result = object->absoluteBoundingBoxRect();
   return result;
 }
 
 }  // namespace blink