wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 534571 - Enable reloads from audio source child to work. r=roc a=blocking2.0

Browse Source
This commit is contained in:
Chris Pearce 2010-07-26 10:45:18 +12:00
parent 4800a81166
commit 86e38ce4c9
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/html/content/src/nsHTMLMediaElement.cpp
View File

@ -496,6 +496,7 @@ void nsHTMLMediaElement::AbortExistingLoads()
mIsLoadingFromSrcAttribute = PR_FALSE;
mSuspendedAfterFirstFrame = PR_FALSE;
mAllowSuspendAfterFirstFrame = PR_TRUE;
mSourcePointer = nsnull;
// TODO: The playback rate must be set to the default playback rate.

1
content/media/test/Makefile.in
View File

@ -111,6 +111,7 @@ _TEST_FILES = \
test_info_leak.html \
test_load.html \
test_load_candidates.html \
test_load_source.html \
test_media_selection.html \
test_mixed_principals.html \
test_mozLoadFrom.html \

77
content/media/test/test_load_source.html Normal file
View File

@ -0,0 +1,77 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=534571
-->
<head>
<title>Test for Bug 534571</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript" src="manifest.js"></script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=534571">Mozilla Bug 534571</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 534571 **/
// Test that when we load a video from a source child and then change the
// source's src attribute and load again, that the subsequent loads work.
var v = null;
var s = null;
function finish(event) {
ok(true, "Should have played both videos");
SimpleTest.finish();
}
var first = null;
var second = null;
function ended(event) {
s.type = second.type;
s.src = second.name;
v.removeEventListener("ended", ended, false);
v.addEventListener("ended", finish, false);
v.load();
}
// Find 2 videos we can play.
v = document.createElement('video');
for (var i=0; i<gPlayTests.length; i++) {
if (!v.canPlayType(gPlayTests[i].type))
continue;
if (!first) {
first = gPlayTests[i];
} else if (!second) {
second = gPlayTests[i];
break;
}
}
if (first && second) {
s = document.createElement('source');
s.type = first.type;
s.src = first.name;
v.appendChild(s);
v.autoplay = true;
v.addEventListener("ended", ended, false);
document.body.appendChild(v);
SimpleTest.waitForExplicitFinish();
} else {
todo(false, "Need at least two media of supported types for this test!");
}
</script>
</pre>
</body>
</html>