Title: [190479] branches/safari-601.1.46-branch/LayoutTests
- Revision
- 190479
- Author
- [email protected]
- Date
- 2015-10-02 01:16:46 -0700 (Fri, 02 Oct 2015)
Log Message
Merged r190438. rdar://problem/22865007
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190478 => 190479)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:15:55 UTC (rev 190478)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:16:46 UTC (rev 190479)
@@ -1,5 +1,19 @@
2015-10-02 Babak Shafiei <[email protected]>
+ Merge r190438.
+
+ 2015-10-01 Brent Fulgham <[email protected]>
+
+ Unreviewed test fix after r190434.
+
+ One test was not updated to pass the new required interruption type
+ argument to 'internals.beginMediaSessionInterruption'.
+
+ * webaudio/audiocontext-state-interrupted-expected.txt:
+ * webaudio/audiocontext-state-interrupted.html:
+
+2015-10-02 Babak Shafiei <[email protected]>
+
Merge r190434.
2015-10-01 Eric Carlson <[email protected]>
Modified: branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted-expected.txt (190478 => 190479)
--- branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted-expected.txt 2015-10-02 08:15:55 UTC (rev 190478)
+++ branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted-expected.txt 2015-10-02 08:16:46 UTC (rev 190479)
@@ -8,7 +8,7 @@
PASS context.state is "running"
Test 1: resume() while interrupted is resolved after the interruption ends.
-internals.beginMediaSessionInterruption()
+internals.beginMediaSessionInterruption("System")
EVENT statechange
PASS context.state is "interrupted"
internals.setMediaSessionRestrictions("WebAudio", "InterruptedPlaybackNotPermitted")
@@ -20,7 +20,7 @@
PASS context.state is "running"
Test 2: resume() while interrupted will cause interruption to end.
-internals.beginMediaSessionInterruption()
+internals.beginMediaSessionInterruption("System")
EVENT statechange
PASS context.state is "interrupted"
internals.setMediaSessionRestrictions("WebAudio", "")
@@ -29,7 +29,7 @@
PASS context.state is "running"
Test 3: running AudioContexts will not resume after an interruption ends.
-internals.beginMediaSessionInterruption()
+internals.beginMediaSessionInterruption("System")
EVENT statechange
PASS context.state is "interrupted"
internals.endMediaSessionInterruption("")
@@ -37,7 +37,7 @@
PASS context.state is "suspended"
Test 4: resume() while interrupted will not resume playback after an interruption.
-internals.beginMediaSessionInterruption()
+internals.beginMediaSessionInterruption("System")
EVENT statechange
PASS context.state is "interrupted"
Calling context.resume()
Modified: branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted.html (190478 => 190479)
--- branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted.html 2015-10-02 08:15:55 UTC (rev 190478)
+++ branches/safari-601.1.46-branch/LayoutTests/webaudio/audiocontext-state-interrupted.html 2015-10-02 08:16:46 UTC (rev 190479)
@@ -43,7 +43,7 @@
context._onstatechange_ = firstInterruptionStarted;
if (window.internals)
- evalAndLog('internals.beginMediaSessionInterruption()');
+ evalAndLog('internals.beginMediaSessionInterruption("System")');
}
@@ -74,7 +74,7 @@
context._onstatechange_ = secondInterruptionStarted;
if (window.internals)
- evalAndLog('internals.beginMediaSessionInterruption()');
+ evalAndLog('internals.beginMediaSessionInterruption("System")');
}
function secondInterruptionStarted(e) {
@@ -98,7 +98,7 @@
context._onstatechange_ = thirdInterruptionStarted;
if (window.internals)
- evalAndLog('internals.beginMediaSessionInterruption()');
+ evalAndLog('internals.beginMediaSessionInterruption("System")');
}
function thirdInterruptionStarted() {
@@ -119,7 +119,7 @@
context._onstatechange_ = fourthInterruptionStarted;
if (window.internals)
- evalAndLog('internals.beginMediaSessionInterruption()');
+ evalAndLog('internals.beginMediaSessionInterruption("System")');
}
function fourthInterruptionStarted() {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
