Changeset 244860 in webkit

Timestamp:

May 1, 2019 5:20:38 PM (5 years ago)

Author:

youenn@apple.com

Message:

Add back hasNullReferences() assert in Document::updateIsPlayingMedia
​https://bugs.webkit.org/show_bug.cgi?id=197477

Reviewed by Eric Carlson.

AudioContext had a special scriptExecutionContext() getter
that was returning nullptr when AudioContext is stopped.
Instead, make this getter behave as all other scriptExecutionContext() getters
and make sure existing call sites of the getter are fine with the change.

Covered by existing tests.

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::AudioContext):
No need to check whether offline since this constructor is for non offline AudioContext.
(WebCore::AudioContext::scriptExecutionContext const):
(WebCore::AudioContext::fireCompletionEvent):

• dom/Document.cpp:

(WebCore::Document::updateIsPlayingMedia):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/AudioContext.cpp (modified) (3 diffs)
• dom/Document.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-01  Youenn Fablet  <youenn@apple.com>
+
+        Add back hasNullReferences() assert in Document::updateIsPlayingMedia
+        https://bugs.webkit.org/show_bug.cgi?id=197477
+
+        Reviewed by Eric Carlson.
+
+        AudioContext had a special scriptExecutionContext() getter
+        that was returning nullptr when AudioContext is stopped.
+        Instead, make this getter behave as all other scriptExecutionContext() getters
+        and make sure existing call sites of the getter are fine with the change.
+
+        Covered by existing tests.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::AudioContext):
+        No need to check whether offline since this constructor is for non offline AudioContext.
+        (WebCore::AudioContext::scriptExecutionContext const):
+        (WebCore::AudioContext::fireCompletionEvent):
+        * dom/Document.cpp:
+        (WebCore::Document::updateIsPlayingMedia):
+
 2019-05-01  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -149 +149 @@
     pageMutedStateDidChange();
 
-    if (!isOfflineContext()) {
-        document.addAudioProducer(*this);
-        document.registerForVisibilityStateChangedCallbacks(*this);
-    }
+    document.addAudioProducer(*this);
+    document.registerForVisibilityStateChangedCallbacks(*this);
 }
 
@@ -1068 +1066 @@
 ScriptExecutionContext* AudioContext::scriptExecutionContext() const
 {
-    return m_isStopScheduled ? 0 : ActiveDOMObject::scriptExecutionContext();
+    return ActiveDOMObject::scriptExecutionContext();
 }
 
@@ -1187 +1185 @@
 
     // Avoid firing the event if the document has already gone away.
-    if (scriptExecutionContext()) {
+    if (!m_isStopScheduled) {
         // Call the offline rendering completion event listener.
         m_eventQueue->enqueueEvent(OfflineAudioCompletionEvent::create(renderedBuffer));

trunk/Source/WebCore/dom/Document.cpp

@@ -3926 +3926 @@
 void Document::updateIsPlayingMedia(uint64_t sourceElementID)
 {
+    ASSERT(!m_audioProducers.hasNullReferences());
     MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
     for (auto& audioProducer : m_audioProducers)