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

Bug 1128500 - Make CustomizationTabPreloader.jsm use HiddenFrame.jsm. r=ttaubert

Browse Source
This commit is contained in:
Alessio Placitelli 2015-02-04 06:34:00 +01:00
parent fd3f2e3886
commit 48d1003b45
1 changed files with 14 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
browser/modules/CustomizationTabPreloader.jsm
View File

@ -12,6 +12,10 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "HiddenFrame",
"resource:///modules/HiddenFrame.jsm");
const HTML_NS = "http://www.w3.org/1999/xhtml";
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@ -60,8 +64,6 @@ this.CustomizationTabPreloaderInternal = {
_browser: null,
uninit: function () {
HostFrame.destroy();
if (this._browser) {
this._browser.destroy();
this._browser = null;
@ -90,6 +92,7 @@ function HiddenBrowser() {
HiddenBrowser.prototype = {
_timer: null,
_hiddenFrame: null,
get isPreloaded() {
return this._browser &&
@ -137,11 +140,19 @@ HiddenBrowser.prototype = {
destroy: function () {
this._removeBrowser();
if (this._hiddenFrame) {
this._hiddenFrame.destroy();
this._hiddenFrame = null;
}
this._timer = clearTimer(this._timer);
},
_createBrowser: function () {
HostFrame.get().then(aFrame => {
if (!this._hiddenFrame) {
this._hiddenFrame = new HiddenFrame();
}
this._hiddenFrame.get().then(aFrame => {
let doc = aFrame.document;
this._browser = doc.createElementNS(XUL_NS, "browser");
this._browser.setAttribute("type", "content");
@ -159,59 +170,3 @@ HiddenBrowser.prototype = {
}
}
};
let HostFrame = {
_frame: null,
_deferred: null,
get hiddenDOMDocument() {
return Services.appShell.hiddenDOMWindow.document;
},
get isReady() {
return this.hiddenDOMDocument.readyState === "complete";
},
get: function () {
if (!this._deferred) {
this._deferred = Promise.defer();
this._create();
}
return this._deferred.promise;
},
destroy: function () {
if (this._frame) {
if (!Cu.isDeadWrapper(this._frame)) {
this._frame.removeEventListener("load", this, true);
this._frame.remove();
}
this._frame = null;
this._deferred = null;
}
},
handleEvent: function () {
let contentWindow = this._frame.contentWindow;
if (contentWindow.location.href === XUL_PAGE) {
this._frame.removeEventListener("load", this, true);
this._deferred.resolve(contentWindow);
} else {
contentWindow.location = XUL_PAGE;
}
},
_create: function () {
if (this.isReady) {
let doc = this.hiddenDOMDocument;
this._frame = doc.createElementNS(HTML_NS, "iframe");
this._frame.addEventListener("load", this, true);
doc.documentElement.appendChild(this._frame);
} else {
let flags = Ci.nsIThread.DISPATCH_NORMAL;
Services.tm.currentThread.dispatch(() => this._create(), flags);
}
}
};