Title: [152846] trunk
Revision
152846
Author
[email protected]
Date
2013-07-18 08:39:25 -0700 (Thu, 18 Jul 2013)

Log Message

Only the first call to 'stop' method of AudioBufferSourceNode must be entertained.
https://bugs.webkit.org/show_bug.cgi?id=118776

Patch by Praveen R Jadhav <[email protected]> on 2013-07-18
Reviewed by Jer Noble.

Source/WebCore:

Subsequent calls to 'stop' for a AudioSourceBufferNode throws an exception.
End time set by first 'stop' method is used for processing.

No new tests. audiobuffersource-exception.html is updated.

* Modules/webaudio/AudioScheduledSourceNode.cpp:
(WebCore::AudioScheduledSourceNode::stop):

LayoutTests:

Test case updated to check subsequent calls to 'stop' for a given AudioBufferSourceNode.

* webaudio/audiobuffersource-exception-expected.txt:
* webaudio/audiobuffersource-exception.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (152845 => 152846)


--- trunk/LayoutTests/ChangeLog	2013-07-18 14:51:53 UTC (rev 152845)
+++ trunk/LayoutTests/ChangeLog	2013-07-18 15:39:25 UTC (rev 152846)
@@ -1,3 +1,15 @@
+2013-07-18  Praveen R Jadhav  <[email protected]>
+
+        Only the first call to 'stop' method of AudioBufferSourceNode must be entertained.
+        https://bugs.webkit.org/show_bug.cgi?id=118776
+
+        Reviewed by Jer Noble.
+
+        Test case updated to check subsequent calls to 'stop' for a given AudioBufferSourceNode.
+
+        * webaudio/audiobuffersource-exception-expected.txt:
+        * webaudio/audiobuffersource-exception.html:
+
 2013-07-18  Zalan Bujtas  <[email protected]>
 
         Unskip mathml tests after r152840.

Modified: trunk/LayoutTests/webaudio/audiobuffersource-exception-expected.txt (152845 => 152846)


--- trunk/LayoutTests/webaudio/audiobuffersource-exception-expected.txt	2013-07-18 14:51:53 UTC (rev 152845)
+++ trunk/LayoutTests/webaudio/audiobuffersource-exception-expected.txt	2013-07-18 15:39:25 UTC (rev 152846)
@@ -4,6 +4,7 @@
 
 PASS bufferSource.stop(0) threw exception Error: InvalidStateError: DOM Exception 11.
 PASS bufferSource.start(0) threw exception Error: InvalidStateError: DOM Exception 11.
+PASS bufferSource.stop(0) threw exception Error: InvalidStateError: DOM Exception 11.
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/webaudio/audiobuffersource-exception.html (152845 => 152846)


--- trunk/LayoutTests/webaudio/audiobuffersource-exception.html	2013-07-18 14:51:53 UTC (rev 152845)
+++ trunk/LayoutTests/webaudio/audiobuffersource-exception.html	2013-07-18 15:39:25 UTC (rev 152846)
@@ -40,6 +40,9 @@
     shouldThrow("bufferSource.start(0)", "'Error: InvalidStateError: DOM Exception 11'");
     bufferSource.stop(0);
 
+    // 'stop' should be called only once.
+    shouldThrow("bufferSource.stop(0)", "'Error: InvalidStateError: DOM Exception 11'");
+
     context._oncomplete_ = finishJSTest;
     context.startRendering();
 }

Modified: trunk/Source/WebCore/ChangeLog (152845 => 152846)


--- trunk/Source/WebCore/ChangeLog	2013-07-18 14:51:53 UTC (rev 152845)
+++ trunk/Source/WebCore/ChangeLog	2013-07-18 15:39:25 UTC (rev 152846)
@@ -1,3 +1,18 @@
+2013-07-18  Praveen R Jadhav  <[email protected]>
+
+        Only the first call to 'stop' method of AudioBufferSourceNode must be entertained.
+        https://bugs.webkit.org/show_bug.cgi?id=118776
+
+        Reviewed by Jer Noble.
+
+        Subsequent calls to 'stop' for a AudioSourceBufferNode throws an exception.
+        End time set by first 'stop' method is used for processing.
+
+        No new tests. audiobuffersource-exception.html is updated.
+
+        * Modules/webaudio/AudioScheduledSourceNode.cpp:
+        (WebCore::AudioScheduledSourceNode::stop):
+
 2013-07-18  Christophe Dumez  <[email protected]>
 
         Simplify SVG animated type handling in the JSC bindings generator

Modified: trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (152845 => 152846)


--- trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp	2013-07-18 14:51:53 UTC (rev 152845)
+++ trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp	2013-07-18 15:39:25 UTC (rev 152846)
@@ -154,7 +154,7 @@
 void AudioScheduledSourceNode::stop(double when, ExceptionCode& ec)
 {
     ASSERT(isMainThread());
-    if (!(m_playbackState == SCHEDULED_STATE || m_playbackState == PLAYING_STATE)) {
+    if (!(m_playbackState == SCHEDULED_STATE || m_playbackState == PLAYING_STATE) || (m_endTime != UnknownTime)) {
         ec = INVALID_STATE_ERR;
         return;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to