gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-13 07:25:45 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup module globals more eagerly.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-13 17:10:27 -05:00
parent 97da21c4aa
commit 3e85415890
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/modules/bootstrap.jsm
View File

@@ -36,22 +36,12 @@ if (!JSMLoader || JSMLoader.bump != 1)
delete this.stale[url];
let global = this.globals[url];
for each (let prop in Object.getOwnPropertyNames(global))
try {
if (!(prop in this.builtin) && ["JSMLoader", "set"].indexOf(prop) < 0 &&
!global.__lookupGetter__(prop))
global[prop] = undefined;
}
catch (e) {
dump("Deleting property " + prop + " on " + url + ":\n " + e + "\n");
Components.utils.reportError(e);
}
if (stale === this.getTarget(url))
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript(url, global.global || global);
}
try {
let global = Components.utils.import(url, target);
@@ -73,9 +63,23 @@ if (!JSMLoader || JSMLoader.bump != 1)
this.manager.unregisterFactory(factory.classID, factory);
},
purge: function purge() {
for (let [url, global] in Iterator(this.globals))
for (let [url, global] in Iterator(this.globals)) {
this.stale[url] = this.getTarget(url);
for each (let prop in Object.getOwnPropertyNames(global))
try {
if (!(prop in this.builtin) &&
["JSMLoader", "set", "EXPORTED_SYMBOLS"].indexOf(prop) < 0 &&
!global.__lookupGetter__(prop))
global[prop] = undefined;
}
catch (e) {
dump("Deleting property " + prop + " on " + url + ":\n " + e + "\n");
Components.utils.reportError(e);
}
}
},
registerFactory: function registerFactory(factory) {
this.manager.registerFactory(factory.classID,
String(factory.classID),

5
common/modules/util.jsm
View File

@@ -965,9 +965,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
services.observer.removeObserver(this, "dactyl-rehash");
defineModule.loadLog.push("dactyl: util: observe: dactyl-rehash");
if (this.rehashing)
JSMLoader.purge();
else
if (!this.rehashing)
for (let module in values(defineModule.modules)) {
defineModule.loadLog.push("dactyl: util: init(" + module + ")");
if (module.reinit)
@@ -978,7 +976,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
},
"dactyl-purge": function () {
this.rehashing = 1;
JSMLoader.purge();
},
"toplevel-window-ready": function (window, data) {
window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {