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

Backed out changeset f3b94fd3b799 (bug 985742) test failures in browser-chrome

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-04-04 11:28:19 +02:00
parent 44999a592c
commit d0798c61eb
1 changed files with 33 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
browser/fuel/src/fuelApplication.js
View File

@ -4,9 +4,8 @@
const Ci = Components.interfaces;
const Cc = Components.classes;
const Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
const APPLICATION_CID = Components.ID("fe74cf80-aa2d-11db-abbd-0800200c9a66");
const APPLICATION_CONTRACTID = "@mozilla.org/fuel/application;1";
@ -730,8 +729,6 @@ var ApplicationFactory = {
};
#include ../../../toolkit/components/exthelper/extApplication.js
//=================================================
// Application constructor
function Application() {
@ -740,90 +737,60 @@ function Application() {
//=================================================
// Application implementation
function ApplicationPrototype() {
Application.prototype = {
// for nsIClassInfo + XPCOMUtils
this.classID = APPLICATION_CID;
classID: APPLICATION_CID,
// redefine the default factory for XPCOMUtils
this._xpcom_factory = ApplicationFactory;
_xpcom_factory: ApplicationFactory,
// for nsISupports
this.QueryInterface = XPCOMUtils.generateQI([
Ci.fuelIApplication,
Ci.extIApplication,
Ci.nsIObserver,
Ci.nsISupportsWeakReference
]);
QueryInterface: XPCOMUtils.generateQI([Ci.fuelIApplication, Ci.extIApplication,
Ci.nsIObserver, Ci.nsISupportsWeakReference]),
// for nsIClassInfo
this.classInfo = XPCOMUtils.generateCI({
classID: APPLICATION_CID,
contractID: APPLICATION_CONTRACTID,
interfaces: [
Ci.fuelIApplication,
Ci.extIApplication,
Ci.nsIObserver
],
flags: Ci.nsIClassInfo.SINGLETON
});
classInfo: XPCOMUtils.generateCI({classID: APPLICATION_CID,
contractID: APPLICATION_CONTRACTID,
interfaces: [Ci.fuelIApplication,
Ci.extIApplication,
Ci.nsIObserver],
flags: Ci.nsIClassInfo.SINGLETON}),
// for nsIObserver
this.observe = function (aSubject, aTopic, aData) {
observe: function app_observe(aSubject, aTopic, aData) {
// Call the extApplication version of this function first
var superPrototype = Object.getPrototypeOf(Object.getPrototypeOf(this));
superPrototype.observe.call(this, aSubject, aTopic, aData);
this.__proto__.__proto__.observe.call(this, aSubject, aTopic, aData);
if (aTopic == "xpcom-shutdown") {
this._obs.removeObserver(this, "xpcom-shutdown");
Utilities.free();
}
};
},
Object.defineProperty(this, "bookmarks", {
get: function bookmarks () {
let bookmarks = new BookmarkRoots();
Object.defineProperty(this, "bookmarks", { value: bookmarks });
return this.bookmarks;
},
enumerable: true,
configurable: true
});
get bookmarks() {
let bookmarks = new BookmarkRoots();
this.__defineGetter__("bookmarks", function() bookmarks);
return this.bookmarks;
},
Object.defineProperty(this, "windows", {
get: function windows() {
var win = [];
var browserEnum = Utilities.windowMediator.getEnumerator("navigator:browser");
get windows() {
var win = [];
var browserEnum = Utilities.windowMediator.getEnumerator("navigator:browser");
while (browserEnum.hasMoreElements())
win.push(getWindow(browserEnum.getNext()));
while (browserEnum.hasMoreElements())
win.push(getWindow(browserEnum.getNext()));
return win;
},
enumerable: true,
configurable: true
});
Object.defineProperty(this, "activeWindow", {
get: function () {
let { RecentWindow } = Cu.import("resource:///modules/RecentWindow.jsm", {});
Object.defineProperty(this, "activeWindow", {
get: () => RecentWindow.getMostRecentBrowserWindow(),
enumerable: true,
configurable: true
});
return this.activeWindow;
},
enumerable: true,
configurable: true
});
return win;
},
get activeWindow() {
return getWindow(Utilities.windowMediator.getMostRecentWindow("navigator:browser"));
}
};
// set the proto, defined in extApplication.js
ApplicationPrototype.prototype = extApplication.prototype;
#include ../../../toolkit/components/exthelper/extApplication.js
Application.prototype = new ApplicationPrototype();
// set the proto, defined in extApplication.js
Application.prototype.__proto__ = extApplication.prototype;
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Application]);