Changeset 269047 in webkit

Timestamp:

Oct 27, 2020, 10:09:34 AM (6 years ago)

Author:

Chris Dumez

Message:

Calling AudioContext.suspend() / resume() while already suspended / running should resolve the promise right away
​https://bugs.webkit.org/show_bug.cgi?id=218236

Reviewed by Sam Weinig.

Source/WebCore:

Calling AudioContext.suspend() / resume() while already suspended / running should resolve the promise right
away. This is the behavior in the specification [1][2] and matches Blink / Gecko.

[1] ​https://www.w3.org/TR/webaudio/#dom-audiocontext-suspend
[2] ​https://www.w3.org/TR/webaudio/#dom-audiocontext-resume

Tests: webaudio/resume-context-while-running.html

webaudio/suspend-context-while-suspended.html

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::suspendRendering):
(WebCore::AudioContext::resumeRendering):

LayoutTests:

Add layout test coverage.

• webaudio/resume-context-while-running-expected.txt: Added.
• webaudio/resume-context-while-running.html: Added.
• webaudio/suspend-context-while-suspended-expected.txt: Added.
• webaudio/suspend-context-while-suspended.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        Calling AudioContext.suspend() / resume() while already suspended / running should resolve the promise right away
+        https://bugs.webkit.org/show_bug.cgi?id=218236
+
+        Reviewed by Sam Weinig.
+
+        Add layout test coverage.
+
+        * webaudio/resume-context-while-running-expected.txt: Added.
+        * webaudio/resume-context-while-running.html: Added.
+        * webaudio/suspend-context-while-suspended-expected.txt: Added.
+        * webaudio/suspend-context-while-suspended.html: Added.
+
 2020-10-27  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        Calling AudioContext.suspend() / resume() while already suspended / running should resolve the promise right away
+        https://bugs.webkit.org/show_bug.cgi?id=218236
+
+        Reviewed by Sam Weinig.
+
+        Calling AudioContext.suspend() / resume() while already suspended / running should resolve the promise right
+        away. This is the behavior in the specification [1][2] and matches Blink / Gecko.
+
+        [1] https://www.w3.org/TR/webaudio/#dom-audiocontext-suspend
+        [2] https://www.w3.org/TR/webaudio/#dom-audiocontext-resume
+
+        Tests: webaudio/resume-context-while-running.html
+               webaudio/suspend-context-while-suspended.html
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::suspendRendering):
+        (WebCore::AudioContext::resumeRendering):
+
 2020-10-27  Chris Lord  <clord@igalia.com>
 

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

@@ -215 +215 @@
     }
 
-    addReaction(State::Suspended, WTFMove(promise));
     m_wasSuspendedByScript = true;
 
-    if (!willPausePlayback())
-        return;
-
-    lazyInitialize();
-
-    destinationNode()->suspend([this, protectedThis = makeRef(*this)] {
+    if (!willPausePlayback()) {
+        addReaction(State::Suspended, WTFMove(promise));
+        return;
+    }
+
+    lazyInitialize();
+
+    destinationNode()->suspend([this, protectedThis = makeRef(*this), promise = WTFMove(promise)]() mutable {
         setState(State::Suspended);
+        promise.resolve();
     });
 }
@@ -240 +242 @@
     }
 
-    addReaction(State::Running, WTFMove(promise));
     m_wasSuspendedByScript = false;
 
-    if (!willBeginPlayback())
-        return;
-
-    lazyInitialize();
-
-    destinationNode()->resume([this, protectedThis = makeRef(*this)] {
+    if (!willBeginPlayback()) {
+        addReaction(State::Running, WTFMove(promise));
+        return;
+    }
+
+    lazyInitialize();
+
+    destinationNode()->resume([this, protectedThis = makeRef(*this), promise = WTFMove(promise)]() mutable {
         // Since we update the state asynchronously, we may have been interrupted after the
         // call to resume() and before this lambda runs. In this case, we don't want to
@@ -254 +257 @@
         bool interrupted = m_mediaSession->state() == PlatformMediaSession::Interrupted;
         setState(interrupted ? State::Interrupted : State::Running);
+        if (interrupted)
+            addReaction(State::Running, WTFMove(promise));
+        else
+            promise.resolve();
     });
 }