Media Controls: use loadedmetadata and error events.

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

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index f2371c912201335deecb6dde3bc1ab629b6faee1..cd50a3baaef58bdc1e26e7f12e7b61cdcffb8efc 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -1488,18 +1488,17 @@ void HTMLMediaElement::mediaLoadingFailed(WebMediaPlayer::NetworkState error) {
   }
 
   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) {
@@ -1658,8 +1657,6 @@ void HTMLMediaElement::setReadyState(ReadyState state) {
       jumped = true;
     }
 
-    if (mediaControls())
-      mediaControls()->reset();
     if (layoutObject())
       layoutObject()->updateFromElement();
   }
@@ -3852,11 +3849,12 @@ bool HTMLMediaElement::isAutoplayAllowedPerSettings() const {
 }
 
 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 {