Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 10:15:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 881590 - Don't cancel loads when preloading in the hiddenWindow; r=jaws

Browse Source
This commit is contained in:
Tim Taubert 2013-06-17 19:46:55 +02:00
parent d7a7f0ad5c
commit f26a7d206d
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
browser/modules/BrowserNewTabPreloader.jsm
View File

@ -294,8 +294,8 @@ function HiddenBrowser(width, height) {
let doc = aFrame.document;
this._browser = doc.createElementNS(XUL_NS, "browser");
this._browser.setAttribute("type", "content");
this._browser.setAttribute("src", NEWTAB_URL);
doc.getElementById("win").appendChild(this._browser);
this.preload();
});
}
@ -333,16 +333,6 @@ HiddenBrowser.prototype = {
observe: function () {
this._timer = null;
this.preload();
},
preload: function () {
if (!this._browser) {
return;
}
// Make sure the browser has the right size.
this.resize(this._width, this._height);
// Start pre-loading the new tab page.
this._browser.loadURI(NEWTAB_URL);
@ -393,7 +383,10 @@ let HostFrame = {
},
destroy: function () {
this._frame = null;
if (this._frame) {
this._frame.remove();
this._frame = null;
}
},
_create: function (callback) {
@ -401,17 +394,16 @@ let HostFrame = {
let iframe = doc.createElementNS(HTML_NS, "iframe");
doc.documentElement.appendChild(iframe);
let frame = iframe.contentWindow;
let docShell = frame.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDocShell);
iframe.addEventListener("load", function onload() {
iframe.removeEventListener("load", onload, true);
docShell.createAboutBlankContentViewer(null);
frame.location = XUL_PAGE;
let frame = iframe.contentWindow;
frame.location = XUL_PAGE;
let eventHandler = docShell.chromeEventHandler;
eventHandler.addEventListener("DOMContentLoaded", function onLoad() {
eventHandler.removeEventListener("DOMContentLoaded", onLoad, false);
callback(HostFrame._frame = frame);
}, false);
iframe.addEventListener("load", function onload() {
iframe.removeEventListener("load", onload, true);
callback(HostFrame._frame = frame);
}, true);
}, true);
}
};