Issue 4659 - Incorporate element hiding emulation filters

include.preload.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;

[Felix Dahlke, 2016/12/20 14:35:42]

Caused by rebasing.

 
 var typeMap = {
   "img": "IMAGE",
   "input": "IMAGE",
   "picture": "IMAGE",
   "audio": "MEDIA",
   "video": "MEDIA",
   "frame": "SUBDOCUMENT",
   "iframe": "SUBDOCUMENT",
   "object": "OBJECT",
@@ skipping 128 matching lines @@
 
         if (element.style.getPropertyValue(propertyName) != propertyValue ||
             element.style.getPropertyPriority(propertyName) != "important")
           element.style.setProperty(propertyName, propertyValue, "important");
       }
 
       if (collapse)
       {
         collapseElement();
 
         if (MutationObserver)

[Felix Dahlke, 2016/12/20 14:35:42]

Caused by rebasing.

           new MutationObserver(collapseElement).observe(
             element, {
               attributes: true,
               attributeFilter: ["style"]
             }
           );
       }
     }
   );
 }
@@ skipping 248 matching lines @@
     RealWebSocket.prototype.constructor = WebSocket;
   }, eventName);
 }
 
 function ElemHide()
 {
   this.shadow = this.createShadowTree();
   this.style = null;
   this.tracer = null;
 
-  this.propertyFilters = new CSSPropertyFilters(
+  this.elemHideEmulation = new ElemHideEmulation(
     window,
     function(callback)
     {
       ext.backgroundPage.sendMessage({
         type: "filters.get",
-        what: "cssproperties"
+        what: "elemhideemulation"
       }, callback);
     },
     this.addSelectors.bind(this)
   );
 }
 ElemHide.prototype = {
   selectorGroupSize: 200,
 
   createShadowTree: function()
   {
@@ skipping 87 matching lines @@
     {
       var selector = selectors.slice(i, i + this.selectorGroupSize).join(", ");
       this.style.sheet.insertRule(selector + "{display: none !important;}",
                                   this.style.sheet.cssRules.length);
     }
   },
 
   apply: function()
   {
     var selectors = null;
-    var propertyFiltersLoaded = false;
+    var elemHideEmulationLoaded = false;
 
     var checkLoaded = function()
     {
-      if (!selectors || !propertyFiltersLoaded)
+      if (!selectors || !elemHideEmulationLoaded)
         return;
 
       if (this.tracer)
         this.tracer.disconnect();
       this.tracer = null;
 
       if (this.style && this.style.parentElement)
         this.style.parentElement.removeChild(this.style);
       this.style = null;
 
       this.addSelectors(selectors.selectors);
-      this.propertyFilters.apply();
+      this.elemHideEmulation.apply();
 
       if (selectors.trace)
         this.tracer = new ElementHidingTracer(selectors.selectors);
     }.bind(this);
 
     ext.backgroundPage.sendMessage({type: "get-selectors"}, function(response)
     {
       selectors = response;
       checkLoaded();
     });
 
-    this.propertyFilters.load(function()
+    this.elemHideEmulation.load(function()
     {
-      propertyFiltersLoaded = true;
+      elemHideEmulationLoaded = true;
       checkLoaded();
     });
   }
 };
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   wrapWebSocket();
 
   var elemhide = new ElemHide();
   elemhide.apply();
 
   document.addEventListener("error", function(event)
   {
     checkCollapse(event.target);
   }, true);
 
   document.addEventListener("load", function(event)
   {
     var element = event.target;
     if (/^i?frame$/.test(element.localName))
       checkCollapse(element);
   }, true);
 }