mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backed out 2 changesets (bug 1294358) for xp mda failures a=backout CLOSED TREE
Backed out changeset 886441076b5f (bug 1294358) Backed out changeset 848141457f25 (bug 1294358) --HG-- extra : amend_source : 393a51d18d37246cec3617fb3162478cd98b3bb2
This commit is contained in:
parent
6f430a404b
commit
6b3d348f17
Binary file not shown.
@ -1 +0,0 @@
|
||||
Cache-Control: no-store
|
@ -1410,13 +1410,6 @@ var gEMENonMSEFailTests = [
|
||||
},
|
||||
];
|
||||
|
||||
// These are files that are used for video decode suspend in
|
||||
// background tabs tests.
|
||||
var gDecodeSuspendTests = [
|
||||
{ name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
|
||||
{ name:"gizmo-noaudio.mp4", type:"video/mp4", duration:5.56 }
|
||||
];
|
||||
|
||||
function checkMetadata(msg, e, test) {
|
||||
if (test.width) {
|
||||
is(e.videoWidth, test.width, msg + " video width");
|
||||
|
@ -415,8 +415,6 @@ support-files =
|
||||
fragment_play.js
|
||||
gizmo.mp4
|
||||
gizmo.mp4^headers^
|
||||
gizmo-noaudio.mp4
|
||||
gizmo-noaudio.mp4^headers^
|
||||
huge-id3.mp3
|
||||
huge-id3.mp3^headers^
|
||||
id3tags.mp3
|
||||
@ -887,10 +885,11 @@ tags = webvtt
|
||||
[test_fragment_play.html]
|
||||
|
||||
[test_background_video_suspend.html]
|
||||
tags = suspend
|
||||
[test_background_video_suspend_ends.html]
|
||||
skip-if = (os == 'win' && os_version == '5.1')
|
||||
tags = suspend
|
||||
[test_background_video_no_suspend_short_vid.html]
|
||||
skip-if = (os == 'win' && os_version == '5.1')
|
||||
tags = suspend
|
||||
[test_background_video_no_suspend_disabled.html]
|
||||
skip-if = (os == 'win' && os_version == '5.1')
|
||||
tags = suspend
|
||||
|
@ -21,7 +21,7 @@ startTest({
|
||||
// Gizmo.mp4 is about 5.6s
|
||||
[ 'media.suspend-bkgnd-video.delay-ms', 10000 ]
|
||||
],
|
||||
tests: gDecodeSuspendTests,
|
||||
tests: [ { name: "gizmo.mp4" } ],
|
||||
runTest: (test, token) => {
|
||||
let v = appendVideoToDoc(test.name, token);
|
||||
manager.started(token);
|
||||
|
@ -28,7 +28,7 @@ startTest({
|
||||
// of video.
|
||||
[ "media.suspend-bkgnd-video.delay-ms", 1000 ]
|
||||
],
|
||||
tests: gDecodeSuspendTests,
|
||||
tests: [ { name: "gizmo.mp4" } ],
|
||||
runTest: (test, token) => {
|
||||
let v = appendVideoToDoc(test.name, token);
|
||||
manager.started(token);
|
||||
|
@ -1,43 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<meta charset="utf-8">
|
||||
<title>Test Background Suspended Video Fires 'ended' Event</title>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script src="manifest.js"></script>
|
||||
<script src="background_video.js"></script>
|
||||
<link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
|
||||
<p id="display">
|
||||
<div id="content" style="display: none"></div>
|
||||
<pre id="test">
|
||||
<script type="text/javascript">
|
||||
"use strict";
|
||||
|
||||
var manager = new MediaTestManager;
|
||||
|
||||
startTest({
|
||||
desc: "Test Background Suspended Video Fires 'ended' Event",
|
||||
prefs: [
|
||||
[ "media.test.setVisible", true ],
|
||||
[ "media.suspend-bkgnd-video.enabled", true ],
|
||||
// User a short delay to ensure video decode suspend happens before end
|
||||
// of video.
|
||||
[ "media.suspend-bkgnd-video.delay-ms", 1000 ]
|
||||
],
|
||||
tests: gDecodeSuspendTests,
|
||||
runTest: (test, token) => {
|
||||
let v = appendVideoToDoc(test.name, token);
|
||||
manager.started(token);
|
||||
|
||||
// This test checks that 'ended' event is received for videos with
|
||||
// suspended video decoding. This is important for looping video logic
|
||||
// handling in HTMLMediaElement.
|
||||
waitUntilPlaying(v)
|
||||
.then(() => testVideoSuspendsWhenHidden(v))
|
||||
.then(() => waitUntilEnded(v))
|
||||
.then(() => {
|
||||
ok(v.currentTime >= v.duration, 'current time approximates duration.');
|
||||
manager.finished(token);
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</pre>
|
Loading…
Reference in New Issue
Block a user