Issue 2392/2393 - Created container for CSS property filters

lib/filterListener.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
  * 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/>.
  */
 
 /**
  * @fileOverview Component synchronizing filter storage with Matcher instances and ElemHide.
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {ElemHide} = require("elemHide");
+let {CSSRules} = require("cssRules");
 let {defaultMatcher} = require("matcher");
-let {ActiveFilter, RegExpFilter, ElemHideBase} = require("filterClasses");
+let {ActiveFilter, RegExpFilter, ElemHideBase, CSSPropertyFilter} =
+    require("filterClasses");
 let {Prefs} = require("prefs");
 
 /**
  * Value of the FilterListener.batchMode property.
  * @type Boolean
  */
 let batchMode = false;
 
 /**
  * Increases on filter changes, filters will be saved if it exceeds 1.
@@ skipping 109 matching lines @@
   let hasEnabled = false;
   for (let i = 0; i < filter.subscriptions.length; i++)
     if (!filter.subscriptions[i].disabled)
       hasEnabled = true;
   if (!hasEnabled)
     return;
 
   if (filter instanceof RegExpFilter)
     defaultMatcher.add(filter);
   else if (filter instanceof ElemHideBase)
-    ElemHide.add(filter);
+  {
+    if (filter instanceof CSSPropertyFilter)
+      CSSRules.add(filter);
+    else
+      ElemHide.add(filter);
+  }
 }
 
 /**
  * Notifies Matcher instances or ElemHide object about removal of a filter
  * if necessary.
  * @param {Filter} filter filter that has been removed
  */
 function removeFilter(filter)
 {
   if (!(filter instanceof ActiveFilter))
     return;
 
   if (!filter.disabled)
   {
     let hasEnabled = false;
     for (let i = 0; i < filter.subscriptions.length; i++)
       if (!filter.subscriptions[i].disabled)
         hasEnabled = true;
     if (hasEnabled)
       return;
   }
 
   if (filter instanceof RegExpFilter)
     defaultMatcher.remove(filter);
   else if (filter instanceof ElemHideBase)
-    ElemHide.remove(filter);
+  {
+    if (filter instanceof CSSPropertyFilter)
+      CSSRules.remove(filter);
+    else
+      ElemHide.remove(filter);
+  }
 }
 
 /**
  * Subscription change listener
  */
 function onSubscriptionChange(action, subscription, newValue, oldValue)
 {
   FilterListener.setDirty(1);
 
   if (action != "added" && action != "removed" && action != "disabled" && action != "updated")
@@ skipping 61 matching lines @@
  * Generic notification listener
  */
 function onGenericChange(action)
 {
   if (action == "load")
   {
     isDirty = 0;
 
     defaultMatcher.clear();
     ElemHide.clear();
+    CSSRules.clear();
     for (let subscription of FilterStorage.subscriptions)
       if (!subscription.disabled)
         subscription.filters.forEach(addFilter);
     flushElemHide();
   }
   else if (action == "save")
     isDirty = 0;
 }