nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out 2 changesets (bug 1472580) for browser chrome LeakSanitizer failures.

Browse source 
Backed out changeset d3d4619e8133 (bug 1472580)
Backed out changeset 4913ce5ab6cb (bug 1472580)
This commit is contained in:
Brindusan Cristian 2018-07-04 03:53:39 +03:00
parent a4d6a5ba57
commit 4a5a62d50e
2 changed files with 17 additions and 66 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
toolkit/content/browser-content.js
View file

@ -526,11 +526,6 @@ var AudioPlaybackListener = {
utils.mediaSuspend = suspendTypes.SUSPENDED_STOP_DISPOSABLE;
break;
case "resumeMedia":
// User has clicked the tab audio indicator to play a delayed
// media. That's clear user intent to play, so gesture activate
// the content document tree so that the block-autoplay logic
// allows the media to autoplay.
content.document.notifyUserGestureActivation();
utils.mediaSuspend = suspendTypes.NONE_SUSPENDED;
break;
default:

78
toolkit/content/tests/browser/browser_block_autoplay_media.js
View file

@ -7,26 +7,14 @@ var SuspendedType = {
SUSPENDED_PAUSE_DISPOSABLE: 3
};
function check_audio_suspended(browser, suspendedType) {
return ContentTask.spawn(browser, suspendedType, suspendedType => {
var autoPlay = content.document.getElementById("autoplay");
if (!autoPlay) {
ok(false, "Can't get the audio element!");
}
is(autoPlay.computedSuspended, suspendedType,
"The suspeded state of autoplay audio is correct.");
});
}
function check_audio_suspended(suspendedType) {
var autoPlay = content.document.getElementById("autoplay");
if (!autoPlay) {
ok(false, "Can't get the audio element!");
}
function check_audio_paused(browser, shouldBePaused) {
return ContentTask.spawn(browser, shouldBePaused, shouldBePaused => {
var autoPlay = content.document.getElementById("autoplay");
if (!autoPlay) {
ok(false, "Can't get the audio element!");
}
is(autoPlay.paused, shouldBePaused,
"autoplay audio should " + (!shouldBePaused ? "not " : "") + "be paused.");
});
is(autoPlay.computedSuspended, suspendedType,
"The suspeded state of autoplay audio is correct.");
}
add_task(async function setup_test_preference() {
@ -43,7 +31,8 @@ add_task(async function block_autoplay_media() {
await BrowserTestUtils.browserLoaded(tab1.linkedBrowser);
info("- should block autoplay media for non-visited tab1 -");
await check_audio_suspended(tab1.linkedBrowser, SuspendedType.SUSPENDED_BLOCK);
await ContentTask.spawn(tab1.linkedBrowser, SuspendedType.SUSPENDED_BLOCK,
check_audio_suspended);
info("- open new background tab2 -");
let tab2 = window.gBrowser.addTab("about:blank");
@ -51,65 +40,32 @@ add_task(async function block_autoplay_media() {
await BrowserTestUtils.browserLoaded(tab2.linkedBrowser);
info("- should block autoplay for non-visited tab2 -");
await check_audio_suspended(tab2.linkedBrowser, SuspendedType.SUSPENDED_BLOCK);
await ContentTask.spawn(tab2.linkedBrowser, SuspendedType.SUSPENDED_BLOCK,
check_audio_suspended);
info("- select tab1 as foreground tab -");
await BrowserTestUtils.switchTab(window.gBrowser, tab1);
info("- media should be unblocked because the tab was visited -");
await waitForTabPlayingEvent(tab1, true);
await check_audio_suspended(tab1.linkedBrowser, SuspendedType.NONE_SUSPENDED);
await ContentTask.spawn(tab1.linkedBrowser, SuspendedType.NONE_SUSPENDED,
check_audio_suspended);
info("- open another new foreground tab3 -");
let tab3 = await BrowserTestUtils.openNewForegroundTab(window.gBrowser,
"about:blank");
info("- should still play media from tab1 -");
await waitForTabPlayingEvent(tab1, true);
await check_audio_suspended(tab1.linkedBrowser, SuspendedType.NONE_SUSPENDED);
await ContentTask.spawn(tab1.linkedBrowser, SuspendedType.NONE_SUSPENDED,
check_audio_suspended);
info("- should still block media from tab2 -");
await waitForTabPlayingEvent(tab2, false);
await check_audio_suspended(tab2.linkedBrowser, SuspendedType.SUSPENDED_BLOCK);
// Test 4: Disable autoplay, enable asking for permission, and verify
// that when a tab is opened in the background and has had its playback
// start delayed, resuming via the audio tab indicator overrides the
// autoplay blocking logic.
//
// Clicking "play" on the audio tab indicator should always start playback
// in that tab, even if it's in an autoplay-blocked origin.
//
// Also test that that this block-autoplay logic override doesn't survive
// a new document being loaded into the tab; the new document should have
// to satisfy the autoplay requirements on its own.
await SpecialPowers.pushPrefEnv({"set": [
["media.autoplay.enabled", false],
["media.autoplay.enabled.user-gestures-needed", true],
["media.autoplay.ask-permission", true],
]});
info("- open new background tab4 -");
let tab4 = window.gBrowser.addTab("about:blank");
tab4.linkedBrowser.loadURI(PAGE);
await BrowserTestUtils.browserLoaded(tab4.linkedBrowser);
info("- should block autoplay for non-visited tab4 -");
await check_audio_suspended(tab4.linkedBrowser, SuspendedType.SUSPENDED_BLOCK);
await check_audio_paused(tab4.linkedBrowser, true);
tab4.linkedBrowser.resumeMedia();
info("- should not block media from tab4 -");
await waitForTabPlayingEvent(tab4, true);
await check_audio_paused(tab4.linkedBrowser, false);
info("- check that loading a new URI in page clears gesture activation status -");
tab4.linkedBrowser.loadURI(PAGE);
await BrowserTestUtils.browserLoaded(tab4.linkedBrowser);
info("- should block autoplay again as gesture activation status cleared -");
await check_audio_paused(tab4.linkedBrowser, true);
await ContentTask.spawn(tab2.linkedBrowser, SuspendedType.SUSPENDED_BLOCK,
check_audio_suspended);
info("- remove tabs -");
BrowserTestUtils.removeTab(tab1);
BrowserTestUtils.removeTab(tab2);
BrowserTestUtils.removeTab(tab3);
BrowserTestUtils.removeTab(tab4);
});