Issue 2879 - Move element selection into the content process

lib/main.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/.
  */
 
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 let {WindowWrapper} = require("windowWrapper");
 
 // Check whether some preferences can still be found under their old locations
 Prefs.migrate("extensions.adblockplus.ehh-selectelement_key", "selectelement_key");
 Prefs.migrate("extensions.adblockplus.ehh.showhelp", "showhelp");
 
 // Window types to attach to
 let knownWindowTypes = new Set(["navigator:browser", "mail:3pane", "mail:messageWindow"]);
 
 // Use random marker class
 let elementMarkerClass = null;
 {
   let rnd = [];
   let offset = "a".charCodeAt(0);
   for (let i = 0; i < 20; i++)
     rnd.push(offset + Math.random() * 26);
 
   elementMarkerClass = String.fromCharCode.apply(String, rnd);
 }
-exports.elementMarkerClass = elementMarkerClass;
 
 // Load CSS asynchronously
 let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
 request.open("GET", "chrome://elemhidehelper/content/elementmarker.css");
 request.overrideMimeType("text/plain");
 request.addEventListener("load", function(event)
 {
   if (onShutdown.done)
     return;
 
   let data = event.target.responseText.replace(/%%CLASS%%/g, elementMarkerClass);
   let styleService = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService);
   let styleURI = Services.io.newURI("data:text/css," + encodeURIComponent(data), null, null);
   styleService.loadAndRegisterSheet(styleURI, Ci.nsIStyleSheetService.USER_SHEET);
   onShutdown.add(() => styleService.unregisterSheet(styleURI, Ci.nsIStyleSheetService.USER_SHEET));
 }, false);
 request.send(null);
 
 // Load our process script
 let info = require("info");
+info.elementMarkerClass = elementMarkerClass;
+
 let processScript = info.addonRoot + "lib/child/bootstrap.js?" +
     elementMarkerClass + "&" +
     "info=" + encodeURIComponent(JSON.stringify(info));
 let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
                        .getService(Ci.nsIProcessScriptLoader);
 messageManager.loadProcessScript(processScript, true);
 onShutdown.add(() => {
   messageManager.removeDelayedProcessScript(processScript);
   messageManager.QueryInterface(Ci.nsIMessageBroadcaster)
                 .broadcastAsyncMessage("ElemHideHelper:Shutdown");
@@ skipping 39 matching lines @@
       if (element)
         element.parentNode.removeChild(element);
 
       for (let child = window.document.firstChild; child; child = child.nextSibling)
         if (child.nodeType == child.PROCESSING_INSTRUCTION_NODE && child.data.indexOf("elemhidehelper-node") >= 0)
           child.parentNode.removeChild(child);
     }
   });
 }, false);
 request.send(null);