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

Back out changeset 81b802b69a74 (bug 1213154) for Linux/Mulet webgl reftest failures

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2015-10-31 11:58:18 -07:00
parent aa09f4ca5a
commit 0af5050865
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/general/browser_audioTabIcon.js
View File

@ -192,7 +192,7 @@ function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
});
let AudioPlaybackPromise = new Promise(resolve => {
let observer = (subject, topic, data) => {
ok(true, "Should see an audio-playback notification");
ok(false, "Should not see an audio-playback notification");
};
Services.obs.addObserver(observer, "audio-playback", false);
setTimeout(() => {
@ -207,7 +207,7 @@ function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
is(newTab.hasAttribute("soundplaying"), isPlaying, "Expected the correct soundplaying attribute on the new tab");
// Wait to see if an audio-playback event is dispatched.
// Wait to see if an audio-playback event is dispatched. This should not happen!
yield AudioPlaybackPromise;
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");

1
dom/canvas/test/reftest/reftest.list
View File

@ -1,6 +1,5 @@
# WebGL Reftests!
default-preferences pref(webgl.force-enabled,true)
default-preferences pref(dom.audiochannel.mutedByDefault,false)
# Check that disabling works:
== webgl-disable-test.html?nogl wrapper.html?green.png

6
dom/html/HTMLMediaElement.cpp
View File

@ -4748,12 +4748,6 @@ HTMLMediaElement::IsPlayingThroughTheAudioChannel() const
return false;
}
// We should consider any bfcached page or inactive document/channel as
// non-playing.
if (mPausedForInactiveDocumentOrChannel) {
return false;
}
// A loop always is playing
if (HasAttr(kNameSpaceID_None, nsGkAtoms::loop)) {
return true;

2
dom/media/test/crashtests/crashtests.list
View File

@ -7,7 +7,7 @@ load 474744-1.html
HTTP load 481136-1.html # needs to be HTTP to recognize the ogg as an audio file?
load 493915-1.html
load 492286-1.xhtml
skip-if(B2G) load 495794-1.html # in b2g all the media are muted by default
load 495794-1.html
load 576612-1.html
load 752784-1.html
load 789075-1.html