Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #2502 by waiting for the hidden window even when not using it for the background page (#2503)

This commit is contained in:
Gijs 2017-04-01 22:56:50 +01:00 committed by Raymond Hill
parent 5699e85afa
commit 53a794d9b2
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
platform/firefox/bootstrap.js vendored
View File

@ -63,11 +63,7 @@ function startup(data/*, reason*/) {
let appShell = Cc['@mozilla.org/appshell/appShellService;1'] let appShell = Cc['@mozilla.org/appshell/appShellService;1']
.getService(Ci.nsIAppShellService); .getService(Ci.nsIAppShellService);
if ( appShell.createWindowlessBrowser ) { waitForHiddenWindow(appShell);
getWindowlessBrowserFrame(appShell);
} else {
getHiddenWindowBrowserFrame(appShell);
}
} }
function createBgProcess(parentDocument) { function createBgProcess(parentDocument) {
@ -113,7 +109,7 @@ function getWindowlessBrowserFrame(appShell) {
} }
function getHiddenWindowBrowserFrame(appShell) { function waitForHiddenWindow(appShell) {
let isReady = function() { let isReady = function() {
var hiddenDoc; var hiddenDoc;
@ -128,7 +124,20 @@ function getHiddenWindowBrowserFrame(appShell) {
if ( !hiddenDoc || hiddenDoc.readyState !== 'complete' ) { if ( !hiddenDoc || hiddenDoc.readyState !== 'complete' ) {
return false; return false;
} }
createBgProcess(hiddenDoc);
// In theory, it should be possible to create a windowless browser
// immediately, without waiting for the hidden window to have loaded
// completely. However, in practice, on Windows this seems to lead
// to a broken Firefox appearance. To avoid this, we only create the
// windowless browser here. We'll use that rather than the hidden
// window for the actual background page (windowless browsers are
// also what the webextension implementation in Firefox uses for
// background pages).
if ( appShell.createWindowlessBrowser ) {
getWindowlessBrowserFrame(appShell);
} else {
createBgProcess(hiddenDoc);
}
return true; return true;
}; };