Issue 521- Inject our stylesheet on per-site basis rather than globally

lib/elemHide.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 10 matching lines @@
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Utils} = require("utils");
 let {IO} = require("io");
 let {Prefs} = require("prefs");
 let {ElemHideException} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {AboutHandler} = require("elemHideHitRegistration");
 let {TimeLine} = require("timeline");
-let {Policy} = require("contentPolicy");
+let Policy = null;
 
 /**
  * Lookup table, filters by their associated key
  * @type Object
  */
 let filterByKey = Object.create(null);
 
 /**
  * Lookup table, keys of the filters by filter text
  * @type Object
@@ skipping 17 matching lines @@
  * @type nsIURI
  */
 let styleURL = null;
 
 /**
  * Global stylesheet that should be loaded into content windows.
  * @type nsIStyleSheet
  */
 let styleSheet = null;
 
+/**
+ * Use the new way of injecting styles per window that exists since Firefox 33.
+ * @type boolean
+ */
 let useNew = ('preloadSheet' in Utils.styleService);
 
 /**
  * Element hiding component
  * @class
  */
 let ElemHide = exports.ElemHide =
 {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
 
   /**
    * Indicates whether filters have been added or removed since the last apply() call.
    * @type Boolean
    */
   isDirty: false,
 
   /**
    * Inidicates whether the element hiding stylesheet is currently applied.
    * @type Boolean
    */
   applied: false,
 
   /**
    * Called on module startup.
    */
   init: function()
   {
     TimeLine.enter("Entered ElemHide.init()");
+
+    if (useNew) {
+      // Avoid dependency issue.
+      Policy = require("contentPolicy").Policy;
+    }
+
     Prefs.addListener(function(name)
     {
       if (name == "enabled")
         ElemHide.apply();
     });
 
     if (useNew)
       Services.obs.addObserver(this, "content-document-global-created", true);
 
     onShutdown.add(() =>
@@ skipping 14 matching lines @@
   },
 
   observe: function (subject, topic, data, additional)
   {
     if (topic != "content-document-global-created")
       return;
 
     if (!Prefs.enabled)
       return;
 
-    let process = Policy.processWindow(subject);
-    dump(subject.document.documentURIObject.spec + " is okay " +  process + "\n");
-    if (process)
+    if (Policy.shouldNeverBlockWindow(subject))
       return;
 
-    // XXX at this point the window might still be whitelisted
-    try
-    {
-      let utils = subject.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIDOMWindowUtils);
-      utils.addSheet(styleSheet, Ci.nsIStyleSheetService.USER_SHEET);
-    }
-    catch (e)
-    {
-      Cu.reportError(e);
+    if (styleSheet)
+    {
+      try
+      {
+        let utils = subject.QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIDOMWindowUtils);
+        utils.addSheet(styleSheet, Ci.nsIStyleSheetService.USER_SHEET);
+      }
+      catch (e)
+      {
+        Cu.reportError(e);
+      }
     }
    },
 
   /**
    * Removes all known filters
    */
   clear: function()
   {
     filterByKey = Object.create(null);
     keyByFilter = Object.create(null);
@@ skipping 162 matching lines @@
       {
         ElemHide.isDirty = false;
 
         ElemHide.unapply();
         TimeLine.log("ElemHide.unapply() finished");
 
         if (!noFilters)
         {
           try
           {
-            if (!useNew) {
+            if (!useNew)
               Utils.styleService.loadAndRegisterSheet(styleURL, Ci.nsIStyleSheetService.USER_SHEET);
-            } else {
+            else
               styleSheet = Utils.styleService.preloadSheet(styleURL, Ci.nsIStyleSheetService.USER_SHEET);
-            }
             ElemHide.applied = true;
           }
           catch (e)
           {
             Cu.reportError(e);
           }
           TimeLine.log("Applying stylesheet finished");
         }
 
         FilterNotifier.triggerListeners("elemhideupdate");
@@ skipping 107 matching lines @@
 
       if (specificOnly && (!domains || domains[""]))
         continue;
 
       if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain))
         result.push(filter.selector);
     }
     return result;
   }
 };