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

Backed out changeset ee7d34a58f11 (bug 886173) for mochitest 1 failures in test_playback_rate.html

Browse Source
This commit is contained in:
Ed Morley 2013-07-11 15:31:52 +01:00
parent 4505c3bea8
commit 7d3ce53582
4 changed files with 2 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/html/content/src/HTMLMediaElement.cpp
View File

@ -2097,6 +2097,8 @@ HTMLMediaElement::Play(ErrorResult& aRv)
}
}
SetPlaybackRate(mDefaultPlaybackRate);
mPaused = false;
mAutoplaying = false;
// We changed mPaused and mAutoplaying which can affect AddRemoveSelfReference

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

@ -143,7 +143,6 @@ MOCHITEST_FILES = \
test_VideoPlaybackQuality.html \
test_VideoPlaybackQuality_disabled.html \
test_webvtt_disabled.html \
test_playback_rate_playpause.html \
$(NULL)
# Disabled on Windows for frequent intermittent failures

67
content/media/test/test_playback_rate_playpause.html
View File

@ -1,67 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test that the playbackRate property is not reset when resuming the playback</title>
<script type="text/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>
<pre id="test">
<script class="testbody" type='application/javascript;version=1.8'>
if (navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(0, 1);
} else if (navigator.platform.startsWith("Mac")) {
SimpleTest.expectAssertions(0, 2);
}
let manager = new MediaTestManager;
function ontimeupdate(e) {
var t = e.target;
if (t.currentTime != 0.0) {
t.removeEventListener("timeupdate", ontimeupdate);
t.pause();
is(t.playbackRate, 0.5, "PlaybackRate should not have changed after pause.");
}
}
function onpaused(e) {
var t = e.target;
t.play();
is(t.playbackRate, 0.5, "PlaybackRate should not have changed after resuming playback.");
finish_test(t);
}
function finish_test(element) {
if (element.parentNode)
element.parentNode.removeChild(element);
element.src="";
manager.finished(element.token);
}
function startTest(test, token) {
let elemType = /^audio/.test(test.type) ? "audio" : "video";
let element = document.createElement(elemType);
element.src = test.name;
element.token = token;
element.controls = true;
element.playbackRate = 0.5;
document.body.appendChild(element);
element.addEventListener("timeupdate", ontimeupdate);
element.addEventListener("pause", onpaused);
element.addEventListener("loadedmetadata", function() {
element.play();
});
manager.started(token);
}
manager.runTests(gPlayedTests, startTest);
</script>
</pre>
<div id="elements">
</div>
</body>
</html>

1
toolkit/content/widgets/videocontrols.xml
View File

@ -1004,7 +1004,6 @@
if (this.video.paused || this.video.ended) {
this._triggeredByControls = true;
this.hideClickToPlay();
this.video.playbackRate = this.video.defaultPlaybackRate;
this.video.play();
} else {
this.video.pause();