Media Controls: use loadedmetadata and error events.

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 1470 matching lines @@
     } else {
       BLINK_MEDIA_LOG << "mediaLoadingFailed(" << (void*)this
                       << ") - no more <source> elements, waiting";
       waitForSourceChange();
     }
 
     return;
   }
 
   if (error == WebMediaPlayer::NetworkStateNetworkError &&
-      m_readyState >= kHaveMetadata)
+      m_readyState >= kHaveMetadata) {
     mediaEngineError(MediaError::create(MediaError::kMediaErrNetwork));
-  else if (error == WebMediaPlayer::NetworkStateDecodeError)
+  } else if (error == WebMediaPlayer::NetworkStateDecodeError) {
     mediaEngineError(MediaError::create(MediaError::kMediaErrDecode));
-  else if ((error == WebMediaPlayer::NetworkStateFormatError ||
-            error == WebMediaPlayer::NetworkStateNetworkError) &&
-           m_loadState == LoadingFromSrcAttr)
+  } else if ((error == WebMediaPlayer::NetworkStateFormatError ||
+              error == WebMediaPlayer::NetworkStateNetworkError) &&
+             m_loadState == LoadingFromSrcAttr) {
     noneSupported();
+  }
 
   updateDisplayState();
-  if (mediaControls())

[Zhiqiang Zhang (Slow), 2016/12/19 17:41:39]

Question: I saw the error event is only fired in the true branch above. Is it
safe to remove this?

[mlamouri (slow - plz ping), 2016/12/19 17:57:26]

`mediaEngineError()` and `noneSupported()` both fire a an error event. It is
true that if none of the branches are taken, the event will not be fired and we
would have still reset the controls before. I think if that happens to be a
problem, it's a problem for all type of controls.

-    mediaControls()->reset();
 }
 
 void HTMLMediaElement::setNetworkState(WebMediaPlayer::NetworkState state) {
   BLINK_MEDIA_LOG << "setNetworkState(" << (void*)this << ", "
                   << static_cast<int>(state) << ") - current state is "
                   << static_cast<int>(m_networkState);
 
   if (state == WebMediaPlayer::NetworkStateEmpty) {
     // Just update the cached state and leave, we can't do anything.
     setNetworkState(kNetworkEmpty);
@@ skipping 138 matching lines @@
     if (std::isnan(initialPlaybackPosition))
       initialPlaybackPosition = 0;
 
     if (!jumped && initialPlaybackPosition > 0) {
       UseCounter::count(document(),
                         UseCounter::HTMLMediaElementSeekToFragmentStart);
       seek(initialPlaybackPosition);
       jumped = true;
     }
 
-    if (mediaControls())
-      mediaControls()->reset();
     if (layoutObject())
       layoutObject()->updateFromElement();
   }
 
   bool shouldUpdateDisplayState = false;
 
   if (m_readyState >= kHaveCurrentData && oldState < kHaveCurrentData &&
       !m_haveFiredLoadedData) {
     // Force an update to official playback position to catch non-zero start
     // times that were not known at kHaveMetadata, but are known now that the
@@ skipping 2172 matching lines @@
 
 bool HTMLMediaElement::isAutoplayAllowedPerSettings() const {
   LocalFrame* frame = document().frame();
   if (!frame)
     return false;
   FrameLoaderClient* frameLoaderClient = frame->loader().client();
   return frameLoaderClient && frameLoaderClient->allowAutoplay(false);
 }
 
 void HTMLMediaElement::setNetworkState(NetworkState state) {
-  if (m_networkState != state) {
-    m_networkState = state;
-    if (MediaControls* controls = mediaControls())
-      controls->networkStateChanged();
-  }
+  if (m_networkState == state)
+    return;
+
+  m_networkState = state;
+  if (mediaControls())
+    mediaControls()->networkStateChanged();
 }
 
 void HTMLMediaElement::videoWillBeDrawnToCanvas() const {
   DCHECK(isHTMLVideoElement());
   UseCounter::count(document(), UseCounter::VideoInCanvas);
   if (m_autoplayUmaHelper->hasSource() && !m_autoplayUmaHelper->isVisible())
     UseCounter::count(document(), UseCounter::HiddenAutoplayedVideoInCanvas);
 }
 
 void HTMLMediaElement::scheduleResolvePlayPromises() {
@@ skipping 233 matching lines @@
       kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
 }
 
 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) {
   m_mostlyFillingViewport = true;
   if (m_webMediaPlayer)
     m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport);
 }
 
 }  // namespace blink