Enable multi-process and avoid CPOW

Author: nmaier

content-script.js

@@ -87,7 +87,7 @@ const createFrame = (window, src, allowScripts, loadFun) => {
     frame.removeEventListener("load", loadHandler, false);
     log(LOG_INFO, "frame loaded, going to process");
     try {
-      loadFun.call(frame);
+      loadFun(frame);
     }
     catch (ex) {
       log(LOG_ERROR, "failed to invoke callback on frame", ex);
@@ -103,7 +103,7 @@ const createFrame = (window, src, allowScripts, loadFun) => {
       frame.removeEventListener("abort", errorHandler, false);
       log(LOG_ERROR, "frame err'ed out, giving up");
       try {
-        loadFun.call(frame);
+        loadFun(frame);
       }
       catch (ex) {
         log(LOG_ERROR, "failed to invoke callback on frame", ex);
@@ -279,28 +279,44 @@ Repaginator.prototype = {
       delete this._title;
     }
   },
+  unregister: function R_unregister() {
+    sendAsyncMessage("repagination:unregister", {id: this.frameId});
+    if (this._window) {
+      this._window.document.body.removeAttribute("repagination");
+      this._window.removeEventListener("beforeunload", this.unload, true);
+    }
+  },
   repaginate: function R_repaginate() {
     this.setTitle();
     let wnd = this._window;
     if (!wnd) {
       log(LOG_INFO, "window is gone!");
       return;
     }
+    this.frameId = wnd.QueryInterface(Ci.nsIInterfaceRequestor).
+                       getInterface(Ci.nsIDOMWindowUtils).
+                       outerWindowID;
+    sendAsyncMessage("repagination:register", {id: this.frameId});
+    this.unload = () => {
+      log(LOG_DEBUG, "unload");
+      this.unregister();
+    };
+    wnd.addEventListener("beforeunload", this.unload, true);
+
     try {
       let node = wnd.document.evaluate(
         this.query, wnd.document, null, 9, null).singleNodeValue;
       if (!node) {
         throw new Error("no node");
       }
       wnd.document.body.setAttribute("repagination", "true");
-      let self = this;
-      createFrame(wnd, node.href, this.allowScripts, function() {
-        self.loadNext(this, 0);
+      createFrame(wnd, node.href, this.allowScripts, frame => {
+        this.loadNext(frame, 0);
       });
     }
     catch (ex) {
+      this.unregister();
       this.restoreTitle();
-      wnd.document.body.removeAttribute("repagination");
       log(LOG_ERROR, "repaginate failed", ex);
     }
   },
@@ -365,6 +381,7 @@ Repaginator.prototype = {
       let ownerDoc = element.ownerDocument;
       if (!ownerDoc || !this._window) {
         yield true;
+        this.unregister();
         this.restoreTitle();
         log(LOG_INFO, "gone, giving up!");
         return;
@@ -474,28 +491,28 @@ Repaginator.prototype = {
 
         this.setTitle();
         log(LOG_INFO, "next please");
-        let self = this;
         createFrame(ownerDoc.defaultView, node.href, this.allowScripts,
-                    function continueLoadNext() {
-          if (!self || !self._window || self._window.closed) {
+                    frame => {
+          if (!this._window || this._window.closed) {
             log(LOG_DEBUG, "self is gone by now");
-            self.restoreTitle();
+            this.unregister();
+            this.restoreTitle();
             return;
           }
-          if (self.slideshow && self.seconds) {
-            log(LOG_INFO, "slideshow; delay: " + self.seconds * 1000);
-            self.loadNext(this, self.seconds * 1000);
+          if (this.slideshow && this.seconds) {
+            log(LOG_INFO, "slideshow; delay: " + this.seconds * 1000);
+            this.loadNext(frame, this.seconds * 1000);
           }
           else {
             log(LOG_INFO, "regular; no-delay");
-            self.loadNext(this, 0);
+            this.loadNext(frame, 0);
           }
         });
       }
       catch (ex) {
         log(LOG_INFO, "loadNext complete", ex);
+        this.unregister();
         this.restoreTitle();
-        ownerDoc.body.removeAttribute("repagination");
       }
     }
     finally {

install.rdf

@@ -10,6 +10,7 @@
     <em:version>2015.10.11</em:version>
 
     <em:bootstrap>true</em:bootstrap>
+    <em:multiprocessCompatible>true</em:multiprocessCompatible>
     <em:type>2</em:type>
 
     <em:optionsURL>chrome://repagination/content/options.xul</em:optionsURL>

main.js

@@ -5,6 +5,26 @@
 
 const {registerOverlay, unloadWindow} = require("sdk/windows");
 
+const RUNNING = new Set();
+const globalMM = Cc["@mozilla.org/globalmessagemanager;1"].
+                 getService(Ci.nsIMessageListenerManager);
+
+function registerRunning(m) {
+  RUNNING.add(m.data.id);
+  log(LOG_DEBUG, `added ${m.data.id} to running`);
+}
+
+function unregisterRunning(m) {
+  RUNNING.delete(m.data.id);
+  log(LOG_DEBUG, `removed ${m.data.id} from running`);
+}
+globalMM.addMessageListener("repagination:register", registerRunning);
+globalMM.addMessageListener("repagination:unregister", unregisterRunning);
+unload(() => {
+  globalMM.removeMessageListener("repagination:register", registerRunning);
+  globalMM.removeMessageListener("repagination:unregister", unregisterRunning);
+});
+
 /* globals _ */
 lazy(this, "_", function() {
   let bundle = require("sdk/strings").
@@ -14,26 +34,15 @@ lazy(this, "_", function() {
   };
 });
 
-function checkSameOrigin(node, tryLoadUri) {
+function checkSameOrigin(principal, tryLoadUri) {
   try {
     if (!(tryLoadUri instanceof Ci.nsIURI)) {
       tryLoadUri = Services.io.newURI(tryLoadUri, null, null);
     }
     if (tryLoadUri.schemeIs("data")) {
       return true;
     }
-    let pr = node.nodePrincipal;
-    pr = Cc["@mozilla.org/scriptsecuritymanager;1"].
-      getService(Ci.nsIScriptSecurityManager).
-      getAppCodebasePrincipal(pr.URI,
-                              pr.appId,
-                              pr.isInBrowserElement);
-    if (pr.checkMayLoad.length == 3) {
-      pr.checkMayLoad(tryLoadUri, false, false);
-    }
-    else {
-      pr.checkMayLoad(tryLoadUri, false);
-    }
+    principal.checkMayLoad(tryLoadUri, false, true);
     return true;
   }
   catch (ex) {
@@ -196,14 +205,13 @@ function main(window, document) {
         menuCurrent.allDomainMenu.hidden || !prefs.showalldomain;
     }
 
-    log(LOG_DEBUG, "context menu showing!");
+    let {gContextMenu} = window;
+    log(LOG_DEBUG, `context menu showing for ${gContextMenu.frameOuterWindowID}!`);
     try {
-      if (window.gContextMenu.onLink &&
-          /^https?$/.test(window.gContextMenu.linkURI.scheme)) {
-        setMenuHidden(!checkSameOrigin(window.gContextMenu.target.ownerDocument,
-                                       window.gContextMenu.linkURL));
-        let body = window.gContextMenu.target.ownerDocument.body;
-        if (!body.hasAttribute("repagination")) {
+      if (gContextMenu.onLink && /^https?$/.test(gContextMenu.linkURI.scheme)) {
+        setMenuHidden(!checkSameOrigin(gContextMenu.principal,
+                                       gContextMenu.linkURL));
+        if (!RUNNING.has(gContextMenu.frameOuterWindowID)) {
           menuCurrent.stopMenu.hidden = true;
         }
         return;
@@ -214,8 +222,7 @@ function main(window, document) {
     }
     try {
       setMenuHidden(true);
-      let body = window.gContextMenu.target.ownerDocument.body;
-      if (body.hasAttribute("repagination")) {
+      if (RUNNING.has(gContextMenu.frameOuterWindowID)) {
         menuCurrent.menu.hidden = menuCurrent.stopMenu.hidden = false;
       }
     }