Issue 4658 - Incorporate element hiding emulation filters

lib/child/elemHideEmulation.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 13 matching lines @@
   let {port} = require("messaging");
   let {getFrames, isPrivate} = require("child/utils");
   let {RequestNotifier} = require("child/requestNotifier");
 
   function getFilters(window, callback)
   {
     let message = {
       frames: getFrames(window),
       payload: {
         type: "filters.get",
-        what: "cssproperties"
+        what: "elemhideemulation"
       }
     };
     port.emitWithResponse("ext_message", message).then(callback);
   }
 
   function addUserCSS(window, cssCode)
   {
     let uri = Services.io.newURI("data:text/css," + encodeURIComponent(cssCode),
         null, null);
     let utils = window.QueryInterface(Ci.nsIInterfaceRequestor)
                       .getInterface(Ci.nsIDOMWindowUtils);
     utils.loadSheet(uri, Ci.nsIDOMWindowUtils.USER_SHEET);
   }
 
-  function initCSSPropertyFilters()
+  function initElemHideEmulation()
   {
-    let scope = {};
+    let scope = Object.assign({}, require("common"));
     Services.scriptloader.loadSubScript(
-        "chrome://adblockplus/content/cssProperties.js", scope);
+        "chrome://adblockplus/content/elemHideEmulation.js", scope);
 
     let onContentWindow = (subject, topic, data) =>
     {
       if (!(subject instanceof Ci.nsIDOMWindow))
         return;
 
       let onReady = event =>
       {
         subject.removeEventListener("load", onReady);
-        let handler = new scope.CSSPropertyFilters(
+        let handler = new scope.ElemHideEmulation(
           subject, getFilters.bind(null, subject), (selectors, filters) =>
           {
             if (selectors.length == 0)
               return;
 
             addUserCSS(subject, selectors.map(
               selector => selector + "{display: none !important;}"
             ).join("\n"));
 
             if (!isPrivate(subject))
@@ skipping 13 matching lines @@
 
             for (let filter of filters)
             {
               RequestNotifier.addNodeData(subject.document, subject.top, {
                 contentType: "ELEMHIDE",
                 docDomain: docDomain,
                 thirdParty: false,
                 // TODO: Show the actual matching selector here?
                 location: filter.replace(/^.*?##/, ""),
                 filter: filter,
-                filterType: "cssproperty"
+                filterType: "elemhideemulation"
               });
             }
           }
         );
 
         handler.load(() => handler.apply());
       };
 
       subject.addEventListener("load", onReady);
     };
 
     Services.obs.addObserver(onContentWindow, "content-document-global-created",
         false);
     onShutdown.add(() =>
     {
       Services.obs.removeObserver(onContentWindow,
           "content-document-global-created");
     });
   }
 
-  initCSSPropertyFilters();
+  initElemHideEmulation();
 })();