Issue 3792 - Fix to support multiprocess firefox

lib/crawler.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
-'use strict';
+"use strict";
 
 /**
  * @module crawler
  */
 
+const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const {Task} = Cu.import("resource://gre/modules/Task.jsm");
+const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
 
 function abprequire(module)
 {
   let result = {};
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
   return result.exports;
 }
 
@@ skipping 77 matching lines @@
    * @param {tab} tab
    */
   releaseTab: function(tab)
   {
     // If we are about to close last tab don't close it immediately to keep
     // the window alive. It will be closed when a new tab is created.
     if (this._tabs > 1)
       this._browser.removeTab(tab);
     else
     {
-      // navigate away from early opened URL

[Wladimir Palant, 2016/09/29 11:44:59]

early => previously

[sergei, 2016/09/29 15:36:22]

Done.

-      tab.linkedBrowser.loadURI('about:blank', null, null);

[Wladimir Palant, 2016/09/29 11:44:59]

Double quotation marks please.

[sergei, 2016/09/29 15:36:22]

Done.

+      // navigate away from previously opened URL
+      tab.linkedBrowser.loadURI("about:blank", null, null);
       this._tabKeepingWindowAlive = tab;
     }
 
     this._tabs--;
     if (this._resolvers.length && this._tabs < this._maxtabs)
     {
       this._resolvers.shift()(this._createTab());
     }
   },
 };
@@ skipping 29 matching lines @@
         window.close();
     }, false);
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference])
 };
 
 function configureFrameScript()
 {
   const info = require("info");
-  const frameScriptPath = info.addonRoot + '/lib/child/frameScript.js?' + Math.random() +
-    '&info=' + encodeURIComponent(JSON.stringify(info));

[Wladimir Palant, 2016/09/29 11:44:59]

Double quotation marks please.

What's the point of sending the info object to the frame script? It doesn't need
this information.

[sergei, 2016/09/29 15:36:22]

Done.
I use info.addonRoot to load modules, however it should be in the commit when it
is actually needed, so I have removed it.

+  let frameScriptPath = info.addonRoot + "/lib/child/frameScript.js";
   Services.mm.loadFrameScript(frameScriptPath, true);
 
   onShutdown.add(() =>
   {
     Services.mm.removeDelayedFrameScript(frameScriptPath);
   });
 }
 
 /**
  * Starts the crawling session. The crawler opens each URL in a tab and stores
@@ skipping 102 matching lines @@
  * @param tab
  *    Tab in which we are interested in
  * @param {int} timeout
  *    Timeout in milliseconds
  * @return {Promise} promise which will be resolved with the received page info
  */
 function getPageInfo(tab, timeout)
 {
   return new Promise((resolve, result) =>
   {
-    const mm = tab.linkedBrowser.messageManager;
+    let mm = tab.linkedBrowser.messageManager;
     let timerID;
     let onDone = (msg) =>
     {
       mm.removeMessageListener("abpcrawler:pageInfoGathered", onDone);
       clearTimeout(timerID);
       resolve(msg.data);
     }
     mm.addMessageListener("abpcrawler:pageInfoGathered", onDone);
     timerID = setTimeout(() => onDone({data: {error: "timeout"}}), timeout);
   });
@@ skipping 43 matching lines @@
 
 function reportException(e)
 {
   let stack = "";
   if (e && typeof e == "object" && "stack" in e)
     stack = e.stack + "\n";
 
   Cu.reportError(e);
   dump(e + "\n" + stack + "\n");
 }