Changeset 196130 in webkit

Timestamp:

Feb 4, 2016 10:03:34 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Specify an exception for createChannelMerger, createChannelSplitter and createPeriodicWave
​https://bugs.webkit.org/show_bug.cgi?id=150925

Patch by Hyemi Shin <​hyemi.sin@samsung.com> on 2016-02-04
Reviewed by Darin Adler.

createChannelMerger and createChannelSplitter should throw INDEX_SIZE_ERR
for invalid numberOfInputs value.
createPeriodicWave should throw INDEX_SIZE_ERR for invalid lengths of parameters.

Source/WebCore:

Tests: webaudio/audiochannelmerger-basic.html

webaudio/audiochannelsplitter.html
webaudio/periodicwave-lengths.html

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::createChannelSplitter):
(WebCore::AudioContext::createChannelMerger):
(WebCore::AudioContext::createPeriodicWave):

LayoutTests:

• webaudio/audiochannelmerger-basic-expected.txt: numberOfInputs could be 32.
• webaudio/audiochannelmerger-basic.html: Ditto.
• webaudio/audiochannelsplitter-expected.txt: Ditto.
• webaudio/audiochannelsplitter.html: Ditto.
• webaudio/periodicwave-lengths-expected.txt: Added.
• webaudio/periodicwave-lengths.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/audiochannelmerger-basic-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/audiochannelmerger-basic.html (modified) (1 diff)
• LayoutTests/webaudio/audiochannelsplitter-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/audiochannelsplitter.html (modified) (1 diff)
• LayoutTests/webaudio/periodicwave-lengths-expected.txt (added)
• LayoutTests/webaudio/periodicwave-lengths.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-04  Hyemi Shin  <hyemi.sin@samsung.com>
+
+        Specify an exception for createChannelMerger, createChannelSplitter and createPeriodicWave
+        https://bugs.webkit.org/show_bug.cgi?id=150925
+
+        Reviewed by Darin Adler.
+
+        createChannelMerger and createChannelSplitter should throw INDEX_SIZE_ERR
+        for invalid numberOfInputs value.
+        createPeriodicWave should throw INDEX_SIZE_ERR for invalid lengths of parameters.
+
+        * webaudio/audiochannelmerger-basic-expected.txt: numberOfInputs could be 32.
+        * webaudio/audiochannelmerger-basic.html: Ditto.
+        * webaudio/audiochannelsplitter-expected.txt: Ditto.
+        * webaudio/audiochannelsplitter.html: Ditto.
+        * webaudio/periodicwave-lengths-expected.txt: Added.
+        * webaudio/periodicwave-lengths.html: Added.
+
 2016-02-04  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/webaudio/audiochannelmerger-basic-expected.txt

@@ -3 +3 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-PASS Exception was thrown for numberOfInputs <= 0.
-PASS Exception was thrown for numberOfInputs >= 32.
+PASS IndexSizeError was thrown for numberOfInputs <= 0.
+PASS IndexSizeError was thrown for numberOfInputs > 32.
 PASS AudioChannelMerger created successfully with numberOfInputs = 32.
 PASS AudioChannelMerger created successfully with empty parameter.

trunk/LayoutTests/webaudio/audiochannelmerger-basic.html

@@ -27 +27 @@
     try {
         var mergernode = context.createChannelMerger(0);
-        testFailed("Exception should be thrown for numberOfInputs <= 0.");
+        testFailed("IndexSizeError should be thrown for numberOfInputs <= 0.");
     } catch(e) {
-        testPassed("Exception was thrown for numberOfInputs <= 0.");
+        if (e.code === DOMException.INDEX_SIZE_ERR)
+            testPassed("IndexSizeError was thrown for numberOfInputs <= 0.");
+        else
+            testFailed("IndexSizeError should be thrown for numberOfInputs <= 0.");
     }
 
     try {
         var mergernode = context.createChannelMerger(33);
-        testFailed("Exception should be thrown for numberOfInputs >= 32.");
+        testFailed("IndexSizeError should be thrown for numberOfInputs > 32.");
     } catch(e) {
-        testPassed("Exception was thrown for numberOfInputs >= 32.");
+        if (e.code === DOMException.INDEX_SIZE_ERR)
+            testPassed("IndexSizeError was thrown for numberOfInputs > 32.");
+        else
+            testFailed("IndexSizeError should be thrown for numberOfInputs > 32.");
     }
 

trunk/LayoutTests/webaudio/audiochannelsplitter-expected.txt

@@ -3 +3 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-PASS Exception been thrown for numberOfOutputs <= 0.
-PASS Exception been thrown for numberOfOutputs >= 32.
+PASS IndexSizeError been thrown for numberOfOutputs <= 0.
+PASS IndexSizeError been thrown for numberOfOutputs > 32.
 PASS AudioChannelSplitter created successfully with numberOfOutputs = 32.
 PASS AudioChannelSplitter has 32 outputs when it is created with numberOfOutputs = 32.

trunk/LayoutTests/webaudio/audiochannelsplitter.html

@@ -86 +86 @@
     try {
         var splitternode = context.createChannelSplitter(0);
-        testFailed("Exception should be thrown for numberOfOutputs <= 0.");
+        testFailed("IndexSizeError should be thrown for numberOfOutputs <= 0.");
     } catch(e) {
-        testPassed("Exception been thrown for numberOfOutputs <= 0.");
+        if (e.code === DOMException.INDEX_SIZE_ERR)
+            testPassed("IndexSizeError been thrown for numberOfOutputs <= 0.");
+        else
+            testFailed("IndexSizeError should be thrown for numberOfOutputs <= 0.");
     }
 
     try {
         var splitternode = context.createChannelSplitter(33);
-        testFailed("Exception should be thrown for numerOfOutputs >= 32.");
+        testFailed("IndexSizeError should be thrown for numerOfOutputs > 32.");
     } catch(e) {
-        testPassed("Exception been thrown for numberOfOutputs >= 32.");
+        if (e.code === DOMException.INDEX_SIZE_ERR)
+            testPassed("IndexSizeError been thrown for numberOfOutputs > 32.");
+        else
+            testFailed("IndexSizeError should be thrown for numerOfOutputs > 32.");
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-04  Hyemi Shin  <hyemi.sin@samsung.com>
+
+        Specify an exception for createChannelMerger, createChannelSplitter and createPeriodicWave
+        https://bugs.webkit.org/show_bug.cgi?id=150925
+
+        Reviewed by Darin Adler.
+
+        createChannelMerger and createChannelSplitter should throw INDEX_SIZE_ERR
+        for invalid numberOfInputs value.
+        createPeriodicWave should throw INDEX_SIZE_ERR for invalid lengths of parameters.
+
+        Tests: webaudio/audiochannelmerger-basic.html
+               webaudio/audiochannelsplitter.html
+               webaudio/periodicwave-lengths.html
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::createChannelSplitter):
+        (WebCore::AudioContext::createChannelMerger):
+        (WebCore::AudioContext::createPeriodicWave):
+
 2016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -609 +609 @@
 
     if (!node.get()) {
-        ec = SYNTAX_ERR;
+        ec = INDEX_SIZE_ERR;
         return nullptr;
     }
@@ -630 +630 @@
 
     if (!node.get()) {
-        ec = SYNTAX_ERR;
+        ec = INDEX_SIZE_ERR;
         return nullptr;
     }
@@ -656 +656 @@
     
     if (!real || !imag || (real->length() != imag->length() || (real->length() > MaxPeriodicWaveLength) || (real->length() <= 0))) {
-        ec = SYNTAX_ERR;
+        ec = INDEX_SIZE_ERR;
         return nullptr;
     }