Issue 2397 - Integrate CSS property filters into adblockpluschrome

include.preload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 267 matching lines @@
   }
 
   return result;
 }
 
 function init(document)
 {
   var shadow = null;
   var style = null;
   var observer = null;
+  var propertyFilters = new CSSPropertyFilters(window, addElemHideSelectors);
 
   // Use Shadow DOM if available to don't mess with web pages that rely on
   // the order of their own <style> tags (#309).
   //
   // However, creating a shadow root breaks running CSS transitions. So we
   // have to create the shadow root before transistions might start (#452).
   //
   // Also, using shadow DOM causes issues on some Google websites,
   // including Google Docs and Gmail (#1770, #2602).
   if ("createShadowRoot" in document.documentElement && !/\.google\.com$/.test(document.domain))
@@ skipping 34 matching lines @@
 
     // WebKit (and Blink?) apparently chokes when the selector list in a
     // CSS rule is huge. So we split the elemhide selectors into groups.
     while (selectors.length > 0)
     {
       var selector = selectors.splice(0, SELECTOR_GROUP_SIZE).join(", ");
       style.sheet.addRule(selector, "display: none !important;");
     }
   };
 
-  var updateStylesheet = function(propertyFilters)

[kzar, 2015/11/30 17:57:32]

I deliberately added a typo in the propertFilters parameter name here and
rebuilt the extension to ensure it would break. It _didn't_ break and I can't
see why. I'm stopping for this evening now but I just want to say that I'm now
suspicious of this code / my method of testing it.

[kzar, 2015/12/01 10:46:04]

OK I think I understand now, this function is only called when using the "Block
element" feature. I was now able to test that it works as I expect, and that it
didn't work before my last change.

+  var updateStylesheet = function()
   {
     var selectors = null;
     var CSSPropertyFiltersLoaded = false;
 
     var checkLoaded = function()
     {
       if (!selectors || !CSSPropertyFiltersLoaded)
         return;
 
       if (observer)
@@ skipping 14 matching lines @@
       checkLoaded();
     });
 
     propertyFilters.load(function()
     {
       CSSPropertyFiltersLoaded = true;
       checkLoaded();
     });
   };
 
-  ext.backgroundPage.sendMessage({type: "get-selectors"}, addElemHideSelectors);

[Sebastian Noack, 2015/12/10 10:30:49]

Any reason we use different logic on initilization than when updating styles? I
guess we can/should keep calling updateStylesheets() in both cases.

[kzar, 2015/12/10 15:16:20]

No reason that I know of, Done.

+  updateStylesheet();
 
   document.addEventListener("error", function(event)
   {
     checkCollapse(event.target);
   }, true);
 
   document.addEventListener("load", function(event)
   {
     var element = event.target;
 
@@ skipping 19 matching lines @@
           // Moreover, "load" and "error" events aren't dispatched for elements
           // in dynamically created frames due to https://crbug.com/442107.
           // So we also have to apply element collpasing from the parent frame.
           if (!contentWindow.collapsing)
             [].forEach.call(contentDocument.querySelectorAll(Object.keys(typeMap).join(",")), checkCollapse);
         }
       }
     }
   }, true);
 
-  if (window.document == document)

[Sebastian Noack, 2015/12/10 10:30:49]

Why don't you just put this code below, outside the functio, similar like it was
done before, if it should only be applied for the top level document?

[kzar, 2015/12/10 15:16:20]

Done.

-  {
-    window.updateStylesheet = updateStylesheet.bind(
-      null, new CSSPropertyFilters(window, addElemHideSelectors)
-    );
-  }
+  return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
-  init(document);
-}
+  window.updateStylesheet = init(document);
+}