Changeset 233982 in webkit

Timestamp:

Jul 19, 2018 6:38:16 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Hitting RELEASE_ASSERT(!m_activeDOMObjectAdditionForbidden) under HTMLMediaElement::resume()
​https://bugs.webkit.org/show_bug.cgi?id=187793
<rdar://problem/42308469>

Patch by Antoine Quint <Antoine Quint> on 2018-07-19
Reviewed by Chris Dumez.

Ensure we do not call JS under resume(), which would happen as a result of calling configureMediaControls() in prepareForLoad().

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::contextDestroyed):
(WebCore::HTMLMediaElement::stop):
(WebCore::HTMLMediaElement::suspend):
(WebCore::HTMLMediaElement::resume):

• html/HTMLMediaElement.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-19  Antoine Quint  <graouts@apple.com>
+
+        Hitting RELEASE_ASSERT(!m_activeDOMObjectAdditionForbidden) under HTMLMediaElement::resume()
+        https://bugs.webkit.org/show_bug.cgi?id=187793
+        <rdar://problem/42308469>
+
+        Reviewed by Chris Dumez.
+
+        Ensure we do not call JS under resume(), which would happen as a result of calling configureMediaControls() in prepareForLoad().
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::~HTMLMediaElement):
+        (WebCore::HTMLMediaElement::contextDestroyed):
+        (WebCore::HTMLMediaElement::stop):
+        (WebCore::HTMLMediaElement::suspend):
+        (WebCore::HTMLMediaElement::resume):
+        * html/HTMLMediaElement.h:
+
 2018-07-19  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -679 +679 @@
 
     m_seekTaskQueue.close();
+    m_resumeTaskQueue.close();
     m_promiseTaskQueue.close();
     m_pauseAfterDetachedTaskQueue.close();
@@ -5584 +5585 @@
 {
     m_seekTaskQueue.close();
+    m_resumeTaskQueue.close();
     m_shadowDOMTaskQueue.close();
     m_promiseTaskQueue.close();
@@ -5606 +5608 @@
     m_promiseTaskQueue.close();
     m_resourceSelectionTaskQueue.close();
+    m_resumeTaskQueue.cancelAllTasks();
 
     // Once an active DOM object has been stopped it can not be restarted, so we can deallocate
@@ -5620 +5623 @@
     INFO_LOG(LOGIDENTIFIER);
     Ref<HTMLMediaElement> protectedThis(*this);
+
+    m_resumeTaskQueue.cancelAllTasks();
 
     switch (reason) {
@@ -5663 +5668 @@
     m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequirePageConsentToResumeMedia);
 
-    if (m_error && m_error->code() == MediaError::MEDIA_ERR_ABORTED) {
+    if (m_error && m_error->code() == MediaError::MEDIA_ERR_ABORTED && !m_resumeTaskQueue.hasPendingTasks()) {
         // Restart the load if it was aborted in the middle by moving the document to the page cache.
         // m_error is only left at MEDIA_ERR_ABORTED when the document becomes inactive (it is set to
@@ -5669 +5674 @@
         // This behavior is not specified but it seems like a sensible thing to do.
         // As it is not safe to immedately start loading now, let's schedule a load.
-        prepareForLoad();
+        m_resumeTaskQueue.enqueueTask(std::bind(&HTMLMediaElement::prepareForLoad, this));
     }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -930 +930 @@
     Timer m_playbackControlsManagerBehaviorRestrictionsTimer;
     Timer m_seekToPlaybackPositionEndedTimer;
+    GenericTaskQueue<Timer> m_resumeTaskQueue;
     GenericTaskQueue<Timer> m_seekTaskQueue;
     GenericTaskQueue<Timer> m_shadowDOMTaskQueue;