Changeset 269039 in webkit

Timestamp:

Oct 27, 2020 8:26:01 AM (21 months ago)

Author:

Chris Dumez

Message:

AudioContext.suspend() should not reject promise when audio session is interrupted
​https://bugs.webkit.org/show_bug.cgi?id=218235

Reviewed by Darin Adler.

Source/WebCore:

AudioContext.suspend() should not reject promise when audio session is interrupted. Being
"interrupted" is an internal WebKit concept and rejecting the promise here is confusing
to Web developers.

We now no longer throw when AudioContext.suspend() is called while interrupted. Instead,
we set the 'wasSuspendedByJavascript' flag and register a state change listener to resolve
the promise when the state changes to "suspended".

When the interruption ends, AudioContext::mayResumePlayback() gets called with
shouldResume=false, causing us to update the state from "interrupted" to "suspended",
which resolves the suspend promise.

Test: webaudio/suspend-context-while-interrupted.html

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::suspendRendering):

LayoutTests:

Add layout test coverage.

• webaudio/suspend-context-while-interrupted-expected.txt: Added.
• webaudio/suspend-context-while-interrupted.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/suspend-context-while-interrupted-expected.txt (added)
• LayoutTests/webaudio/suspend-context-while-interrupted.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        AudioContext.suspend() should not reject promise when audio session is interrupted
+        https://bugs.webkit.org/show_bug.cgi?id=218235
+
+        Reviewed by Darin Adler.
+
+        Add layout test coverage.
+
+        * webaudio/suspend-context-while-interrupted-expected.txt: Added.
+        * webaudio/suspend-context-while-interrupted.html: Added.
+
 2020-10-27  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        AudioContext.suspend() should not reject promise when audio session is interrupted
+        https://bugs.webkit.org/show_bug.cgi?id=218235
+
+        Reviewed by Darin Adler.
+
+        AudioContext.suspend() should not reject promise when audio session is interrupted. Being
+        "interrupted" is an internal WebKit concept and rejecting the promise here is confusing
+        to Web developers.
+
+        We now no longer throw when AudioContext.suspend() is called while interrupted. Instead,
+        we set the 'wasSuspendedByJavascript' flag and register a state change listener to resolve
+        the promise when the state changes to "suspended".
+
+        When the interruption ends, AudioContext::mayResumePlayback() gets called with
+        shouldResume=false, causing us to update the state from "interrupted" to "suspended",
+        which resolves the suspend promise.
+
+        Test: webaudio/suspend-context-while-interrupted.html
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::suspendRendering):
+
 2020-10-27  Antti Koivisto  <antti@apple.com>
 

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

@@ -210 +210 @@
     }
 
-    if (isStopped() || state() == State::Closed || state() == State::Interrupted || !destinationNode()) {
+    if (isStopped() || state() == State::Closed || !destinationNode()) {
         promise.reject(Exception { InvalidStateError, "Context is closed"_s });
         return;