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 53 matching lines @@
 
       if (observer)
         observer.disconnect();
       observer = null;
 
       if (style && style.parentElement)
         style.parentElement.removeChild(style);
       style = null;
 
       addElemHideSelectors(selectors);
-      CSSPropertyFilters.apply();

[Sebastian Noack, 2015/11/30 16:06:29]

This method doesn't exist anymore, since we turned it into a class.

[kzar, 2015/11/30 17:39:07]

Acknowledged.

+      propertyFilters.apply();
     };
 
     ext.backgroundPage.sendMessage({type: "get-selectors"}, function(response)
     {
       selectors = response;
       checkLoaded();
     });
 
-    CSSPropertyFilters.load(function()

[Sebastian Noack, 2015/11/30 16:06:29]

Same for that one. Or do I miss something?

[kzar, 2015/11/30 17:39:07]

No, you're right. I think it's only a coincidence that the code worked as it
was.

I've had a go at fixing it, not entirely sure about my approach. What do you
think?

+    propertyFilters.load(function()
     {
       CSSPropertyFiltersLoaded = true;
       checkLoaded();
     });
   };
 
-  ext.backgroundPage.sendMessage({type: "get-selectors"}, addElemHideSelectors);
+  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)
-  {
-    new CSSPropertyFilters(window, addElemHideSelectors);

[kzar, 2015/11/30 15:51:10]

The changes to this file are almost entirely by Sebastian, I can only take
credit for this part as we now need to pass addElemHideSelectors through to the
CSSPropertyFilters constructor.

-    window.updateStylesheet = updateStylesheet;
-  }
+  return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
-  init(document);
-}
+  window.updateStylesheet = init(document);
+}