Changeset 200833 in webkit

Timestamp:

May 13, 2016, 3:39:45 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r200039 - Stop listening for "media can start" notifications when media player is cleared
​https://bugs.webkit.org/show_bug.cgi?id=156985
<rdar://problem/23158505>

Reviewed by Jer Noble.

No new tests, I have not been able to create a test that reliably reproduces this.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::loadInternal): Add logging.
(WebCore::HTMLMediaElement::selectMediaResource): Assert and return early if there is

no media player.

(WebCore::HTMLMediaElement::clearMediaPlayer): Stop listening for can start notifications.
(WebCore::HTMLMediaElement::visibilityStateChanged): Add logging.
(WebCore::HTMLMediaElement::mediaCanStart): Ditto.

Location:

releases/WebKitGTK/webkit-2.12/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (6 diffs)

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-25  Eric Carlson  <eric.carlson@apple.com>
+
+        Stop listening for "media can start" notifications when media player is cleared
+        https://bugs.webkit.org/show_bug.cgi?id=156985
+        <rdar://problem/23158505>
+
+        Reviewed by Jer Noble.
+
+        No new tests, I have not been able to create a test that reliably reproduces this.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::loadInternal): Add logging.
+        (WebCore::HTMLMediaElement::selectMediaResource): Assert and return early if there is
+          no media player.
+        (WebCore::HTMLMediaElement::clearMediaPlayer): Stop listening for can start notifications.
+        (WebCore::HTMLMediaElement::visibilityStateChanged): Add logging.
+        (WebCore::HTMLMediaElement::mediaCanStart): Ditto.
+
 2016-04-25  Daniel Bates  <dabates@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1124 +1124 @@
 void HTMLMediaElement::loadInternal()
 {
+    LOG(Media, "HTMLMediaElement::loadInternal(%p)", this);
+
     // Some of the code paths below this function dispatch the BeforeLoad event. This ASSERT helps
     // us catch those bugs more quickly without needing all the branches to align to actually
@@ -1131 +1133 @@
     // If we can't start a load right away, start it later.
     if (!m_mediaSession->pageAllowsDataLoading(*this)) {
+        LOG(Media, "HTMLMediaElement::loadInternal(%p) - not allowed to load in background, waiting", this);
         setShouldDelayLoadEvent(false);
         if (m_isWaitingUntilMediaCanStart)
             return;
+        m_isWaitingUntilMediaCanStart = true;
         document().addMediaCanStartListener(this);
-        m_isWaitingUntilMediaCanStart = true;
         return;
     }
@@ -1170 +1173 @@
 {
     LOG(Media, "HTMLMediaElement::selectMediaResource(%p)", this);
+
+    ASSERT(m_player);
+    if (!m_player)
+        return;
 
     enum Mode { attribute, children };
@@ -4981 +4988 @@
 #endif
 
+    if (m_isWaitingUntilMediaCanStart) {
+        m_isWaitingUntilMediaCanStart = false;
+        document().removeMediaCanStartListener(this);
+    }
+
     m_player = nullptr;
 
@@ -5120 +5132 @@
 void HTMLMediaElement::visibilityStateChanged()
 {
-    LOG(Media, "HTMLMediaElement::visibilityStateChanged(%p)", this);
     m_elementIsHidden = document().hidden();
+    LOG(Media, "HTMLMediaElement::visibilityStateChanged(%p) - visible = %s", this, boolString(!m_elementIsHidden));
     updateSleepDisabling();
     m_mediaSession->visibilityChanged();
@@ -5517 +5529 @@
 void HTMLMediaElement::mediaCanStart()
 {
-    LOG(Media, "HTMLMediaElement::mediaCanStart(%p)", this);
+    LOG(Media, "HTMLMediaElement::mediaCanStart(%p) - m_isWaitingUntilMediaCanStart = %s, m_pausedInternal = %s",
+        this, boolString(m_isWaitingUntilMediaCanStart), boolString(m_pausedInternal) );
 
     ASSERT(m_isWaitingUntilMediaCanStart || m_pausedInternal);