Changeset 267376 in webkit

Timestamp:

Sep 21, 2020, 3:50:47 PM (6 years ago)

Author:

Chris Dumez

Message:

Throw when AudioConnect::connect() is called for an output that has no channels
​https://bugs.webkit.org/show_bug.cgi?id=216802

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Rebaseline existing tests because I improved exception messages.

• web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining-expected.txt:
• web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-expected.txt:

Source/WebCore:

Throw when AudioConnect::connect() is called for an output that has no channels, for consistency
with Blink. The ScriptProcessorNode cannot have an output node that has zero channels.

No new tests, rebaselined existing tests.

• Modules/webaudio/AudioNode.cpp:

(WebCore::AudioNode::connect):

LayoutTests:

• webaudio/MediaElementAudioSource/mediaelementaudiosourcenode-expected.txt:
• webaudio/dom-exceptions-expected.txt:

Rebaseline existing tests because I improved exception messages.

• webaudio/ScriptProcessor/scriptprocessornode-0-output-channels-expected.txt:

Rebaseline test that is now passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/MediaElementAudioSource/mediaelementaudiosourcenode-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/ScriptProcessor/scriptprocessornode-0-output-channels-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/dom-exceptions-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioNode.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-21  Chris Dumez  <cdumez@apple.com>
+
+        Throw when AudioConnect::connect() is called for an output that has no channels
+        https://bugs.webkit.org/show_bug.cgi?id=216802
+
+        Reviewed by Darin Adler.
+
+        * webaudio/MediaElementAudioSource/mediaelementaudiosourcenode-expected.txt:
+        * webaudio/dom-exceptions-expected.txt:
+        Rebaseline existing tests because I improved exception messages.
+
+        * webaudio/ScriptProcessor/scriptprocessornode-0-output-channels-expected.txt:
+        Rebaseline test that is now passing.
+
 2020-09-21  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-09-21  Chris Dumez  <cdumez@apple.com>
+
+        Throw when AudioConnect::connect() is called for an output that has no channels
+        https://bugs.webkit.org/show_bug.cgi?id=216802
+
+        Reviewed by Darin Adler.
+
+        Rebaseline existing tests because I improved exception messages.
+
+        * web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining-expected.txt:
+        * web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-expected.txt:
+
 2020-09-21  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining-expected.txt

@@ -59 +59 @@
 PASS < [media-group] All assertions passed. (total 6 assertions) 
 PASS > [invalid-operation]  
-PASS   Connecting with an invalid output threw IndexSizeError: "The index is not in the allowed range.". 
-PASS   Connecting to a node from the different context threw SyntaxError: "The string did not match the expected pattern.". 
+PASS   Connecting with an invalid output threw IndexSizeError: "Output index exceeds number of outputs". 
+PASS   Connecting to a node from the different context threw SyntaxError: "Source and destination nodes belong to different audio contexts". 
 PASS < [invalid-operation] All assertions passed. (total 2 assertions) 
 PASS > [verification]  

trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-expected.txt

@@ -10 +10 @@
 PASS   audioNode.connect(0, 0, 0) threw TypeError: "Argument 1 ('destination') to AudioNode.connect must be an instance of AudioNode". 
 PASS   audioNode.connect(null, 0, 0) threw TypeError: "Argument 1 ('destination') to AudioNode.connect must be an instance of AudioNode". 
-PASS   audioNode.connect(context.destination, 5, 0) threw IndexSizeError: "The index is not in the allowed range.". 
-PASS   audioNode.connect(context.destination, 0, 5) threw IndexSizeError: "The index is not in the allowed range.". 
+PASS   audioNode.connect(context.destination, 5, 0) threw IndexSizeError: "Output index exceeds number of outputs". 
+PASS   audioNode.connect(context.destination, 0, 5) threw IndexSizeError: "Input index exceeds number of inputs". 
 PASS   audioNode.connect(context.destination, 0, 0) did not throw an exception. 
-PASS   Connecting a node to a different context threw SyntaxError: "The string did not match the expected pattern.". 
+PASS   Connecting a node to a different context threw SyntaxError: "Source and destination nodes belong to different audio contexts". 
 PASS   context3 = new AudioContext(1, 44100, 44100) threw TypeError: "Type error". 
 PASS   AudioNode is an EventTarget is true. 

trunk/LayoutTests/webaudio/MediaElementAudioSource/mediaelementaudiosourcenode-expected.txt

@@ -7 +7 @@
 PASS   audioNode.numberOfOutputs is equal to 1. 
 PASS   audioNode.connect(0, 0, 0) threw TypeError: "Argument 1 ('destination') to AudioNode.connect must be an instance of AudioNode". 
-PASS   audioNode.connect(context.destination, 5, 0) threw IndexSizeError: "The index is not in the allowed range.". 
-PASS   audioNode.connect(context.destination, 0, 5) threw IndexSizeError: "The index is not in the allowed range.". 
+PASS   audioNode.connect(context.destination, 5, 0) threw IndexSizeError: "Output index exceeds number of outputs". 
+PASS   audioNode.connect(context.destination, 0, 5) threw IndexSizeError: "Input index exceeds number of inputs". 
 PASS   mediaSource.mediaElement instanceof HTMLMediaElement is true. 
 PASS   mediaSource.mediaElement is same object is true. 

trunk/LayoutTests/webaudio/ScriptProcessor/scriptprocessornode-0-output-channels-expected.txt

@@ -11 +11 @@
 PASS < [initialize] All assertions passed. (total 4 assertions) 
 PASS > [test]  
-FAIL X scriptNode1.connect(analyzer) did not throw an exception. assert_true: expected true got false
+PASS   scriptNode1.connect(analyzer) threw InvalidAccessError: "Node has zero output channels". 
 PASS   scriptNode2.connect(analyzer) did not throw an exception. 
-FAIL < [test] 1 out of 2 assertions were failed. assert_true: expected true got false
-FAIL # AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed. assert_true: expected true got false
+PASS < [test] All assertions passed. (total 2 assertions) 
+PASS # AUDIT TASK RUNNER FINISHED: 2 tasks ran successfully. 
 

trunk/LayoutTests/webaudio/dom-exceptions-expected.txt

@@ -104 +104 @@
 PASS > [connections] AudioNode connections 
 PASS   node.connect(null, 0, 0) threw TypeError: "Argument 1 ('destination') to AudioNode.connect must be an instance of AudioNode". 
-PASS   node.connect(context.destination, 100, 0) threw IndexSizeError: "The index is not in the allowed range.". 
-PASS   node.connect(context.destination, 0, 100) threw IndexSizeError: "The index is not in the allowed range.". 
-PASS   node.connect(node2.gain, 100) threw IndexSizeError: "The index is not in the allowed range.". 
+PASS   node.connect(context.destination, 100, 0) threw IndexSizeError: "Output index exceeds number of outputs". 
+PASS   node.connect(context.destination, 0, 100) threw IndexSizeError: "Input index exceeds number of inputs". 
+PASS   node.connect(node2.gain, 100) threw IndexSizeError: "Output index exceeds number of outputs". 
 PASS   node.disconnect(99) threw IndexSizeError: "output index is out of bounds". 
-PASS   node.connect(otherContext.destination) threw SyntaxError: "The string did not match the expected pattern.". 
+PASS   node.connect(otherContext.destination) threw SyntaxError: "Source and destination nodes belong to different audio contexts". 
 PASS < [connections] All assertions passed. (total 6 assertions) 
 PASS > [channel-stuff] channelCount, channelCountMode, channelInterpretation 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-21  Chris Dumez  <cdumez@apple.com>
+
+        Throw when AudioConnect::connect() is called for an output that has no channels
+        https://bugs.webkit.org/show_bug.cgi?id=216802
+
+        Reviewed by Darin Adler.
+
+        Throw when AudioConnect::connect() is called for an output that has no channels, for consistency
+        with Blink. The ScriptProcessorNode cannot have an output node that has zero channels.
+
+        No new tests, rebaselined existing tests.
+
+        * Modules/webaudio/AudioNode.cpp:
+        (WebCore::AudioNode::connect):
+
 2020-09-21  Yusuke Suzuki  <ysuzuki@apple.com>
 

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

@@ -196 +196 @@
     // Sanity check input and output indices.
     if (outputIndex >= numberOfOutputs())
-        return Exception { IndexSizeError };
+        return Exception { IndexSizeError, "Output index exceeds number of outputs"_s };
 
     if (inputIndex >= destination.numberOfInputs())
-        return Exception { IndexSizeError };
+        return Exception { IndexSizeError, "Input index exceeds number of inputs"_s };
 
     if (&context() != &destination.context())
-        return Exception { SyntaxError };
+        return Exception { SyntaxError, "Source and destination nodes belong to different audio contexts"_s };
 
     auto* input = destination.input(inputIndex);
     auto* output = this->output(outputIndex);
+
+    if (!output->numberOfChannels())
+        return Exception { InvalidAccessError, "Node has zero output channels"_s };
+
     input->connect(output);
 
@@ -225 +229 @@
 
     if (outputIndex >= numberOfOutputs())
-        return Exception { IndexSizeError };
+        return Exception { IndexSizeError, "Output index exceeds number of outputs"_s };
 
     if (&context() != &param.context())
-        return Exception { SyntaxError };
+        return Exception { SyntaxError, "Node and AudioParam belong to different audio contexts"_s };
 
     auto* output = this->output(outputIndex);