Changeset 268999 in webkit

Timestamp:

Oct 26, 2020 4:09:16 PM (21 months ago)

Author:

Chris Dumez

Message:

Improve exception messages when AudioContext.suspend() / resume() promises are rejected
​https://bugs.webkit.org/show_bug.cgi?id=218210

Reviewed by Geoffrey Garen.

Source/WebCore:

Improve exception messages when AudioContext.suspend() / resume() promises are rejected.

No new tests, rebaselined existing tests.

• Modules/webaudio/AudioContext.cpp:

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

LayoutTests:

• webaudio/audiocontext-state.html:

Stop expecting that the resume() promise is rejected without any exception.
This is not standard behavior and does not match the behavior of other
browsers either.

• webaudio/construct-node-with-closed-context-expected.txt:

Rebaseline test now that exception messages have been improved.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/audiocontext-state.html (modified) (1 diff)
• LayoutTests/webaudio/construct-node-with-closed-context-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-26  Chris Dumez  <cdumez@apple.com>
+
+        Improve exception messages when AudioContext.suspend() / resume() promises are rejected
+        https://bugs.webkit.org/show_bug.cgi?id=218210
+
+        Reviewed by Geoffrey Garen.
+
+        * webaudio/audiocontext-state.html:
+        Stop expecting that the resume() promise is rejected without any exception.
+        This is not standard behavior and does not match the behavior of other
+        browsers either.
+
+        * webaudio/construct-node-with-closed-context-expected.txt:
+        Rebaseline test now that exception messages have been improved.
+
 2020-10-26  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/webaudio/audiocontext-state.html

@@ -94 +94 @@
 function resumeFailedCorrectly(value) {
     testPassed('context.resume() promise rejected (correctly)');
-    if (typeof value != 'undefined')
-        testFailed('No value should be passed to the context.resume() promise rejected callback');
     shouldBe('context.state', '"closed"');
 

trunk/LayoutTests/webaudio/construct-node-with-closed-context-expected.txt

@@ -41 +41 @@
 PASS context.createWaveShaper() did not throw exception.
 PASS context.createScriptProcessor() did not throw exception.
-PASS context.suspend() rejected promise  with InvalidStateError: The object is in an invalid state..
-PASS context.resume() rejected promise  with InvalidStateError: The object is in an invalid state..
+PASS context.suspend() rejected promise  with InvalidStateError: Context is closed.
+PASS context.resume() rejected promise  with InvalidStateError: Context is closed.
 PASS context.close() rejected promise  with InvalidStateError: The object is in an invalid state..
 PASS successfullyParsed is true

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-26  Chris Dumez  <cdumez@apple.com>
+
+        Improve exception messages when AudioContext.suspend() / resume() promises are rejected
+        https://bugs.webkit.org/show_bug.cgi?id=218210
+
+        Reviewed by Geoffrey Garen.
+
+        Improve exception messages when AudioContext.suspend() / resume() promises are rejected.
+
+        No new tests, rebaselined existing tests.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::suspendRendering):
+        (WebCore::AudioContext::resumeRendering):
+
 2020-10-26  Adrian Perez de Castro  <aperez@igalia.com>
 

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

@@ -205 +205 @@
 void AudioContext::suspendRendering(DOMPromiseDeferred<void>&& promise)
 {
-    if (isOfflineContext() || isStopped()) {
-        promise.reject(InvalidStateError);
-        return;
-    }
-
-    if (state() == State::Closed || state() == State::Interrupted || !destinationNode()) {
-        promise.reject();
+    if (isOfflineContext()) {
+        promise.reject(Exception { InvalidStateError, "Cannot call suspend() on an OfflineAudioContext"_s });
+        return;
+    }
+
+    if (isStopped() || state() == State::Closed || state() == State::Interrupted || !destinationNode()) {
+        promise.reject(Exception { InvalidStateError, "Context is closed"_s });
         return;
     }
@@ -230 +230 @@
 void AudioContext::resumeRendering(DOMPromiseDeferred<void>&& promise)
 {
-    if (isOfflineContext() || isStopped()) {
-        promise.reject(InvalidStateError);
-        return;
-    }
-
-    if (state() == State::Closed || !destinationNode()) {
-        promise.reject();
+    if (isOfflineContext()) {
+        promise.reject(Exception { InvalidStateError, "Cannot call resume() on an OfflineAudioContext"_s });
+        return;
+    }
+
+    if (isStopped() || state() == State::Closed || !destinationNode()) {
+        promise.reject(Exception { InvalidStateError, "Context is closed"_s });
         return;
     }