Issue 4394 - Create a filter class for element hiding emulation filters

chrome/content/elemHideEmulation.js

+var propertySelectorRegExp = /\[\-abp\-properties=(["'])([^"']+)\1\]/;
+
 function splitSelector(selector)
 {
   if (selector.indexOf(",") == -1)
     return [selector];
 
   var selectors = [];
   var start = 0;
   var level = 0;
   var sep = "";
 
@@ skipping 18 matching lines @@
         selectors.push(selector.substring(start, i));
         start = i + 1;
       }
     }
   }
 
   selectors.push(selector.substring(start));
   return selectors;
 }
 
-function CSSPropertyFilters(window, getFiltersFunc, addSelectorsFunc)
+function ElemHideEmulation(window, getFiltersFunc, addSelectorsFunc)
 {
   this.window = window;
   this.getFiltersFunc = getFiltersFunc;
   this.addSelectorsFunc = addSelectorsFunc;
 }
 
-CSSPropertyFilters.prototype = {
+ElemHideEmulation.prototype = {
   stringifyStyle: function(style)
   {
     var styles = [];
     for (var i = 0; i < style.length; i++)
     {
       var property = style.item(i);
       var value    = style.getPropertyValue(property);
       var priority = style.getPropertyPriority(property);
       styles.push(property + ": " + value + (priority ? " !" + priority : "") + ";");
     }
@@ skipping 28 matching lines @@
     for (var i = 0; i < rules.length; i++)
     {
       var rule = rules[i];
       if (rule.type != rule.STYLE_RULE)
         continue;
 
       var style = this.stringifyStyle(rule.style);
       for (var j = 0; j < this.patterns.length; j++)
       {
         var pattern = this.patterns[j];
-        var regexp = pattern.regexp;
-
-        if (typeof regexp == "string")
-          regexp = pattern.regexp = new RegExp(regexp, "i");
-
-        if (regexp.test(style))
+        if (pattern.regexp.test(style))
         {
           var subSelectors = splitSelector(rule.selectorText);
           for (var k = 0; k < subSelectors.length; k++)
             selectors.push(pattern.prefix + subSelectors[k] + pattern.suffix);
           filters[pattern.text] = true;
         }
       }
     }
   },
 
@@ skipping 10 matching lines @@
   {
     var stylesheet = event.target.sheet;
     if (stylesheet)
       this.addSelectors([stylesheet]);
   },
 
   load: function(callback)
   {
     this.getFiltersFunc(function(patterns)
     {
-      this.patterns = patterns;
+      this.patterns = [];
+      for (var i = 0; i < patterns.length; i++)
+      {
+        var pattern = patterns[i];
+        var match = propertySelectorRegExp.exec(pattern.selector);
+        if (!match)
+          continue;
+
+        var propertyExpression = match[2];
+        var regexpString;
+        if (propertyExpression.length >= 2 && propertyExpression[0] == "/" &&
+            propertyExpression[propertyExpression.length - 1] == "/")
+          regexpString = propertyExpression.slice(1, -1);
+        else
+          regexpString = filterToRegExp(propertyExpression);
+
+        this.patterns.push({
+          text: pattern.text,
+          regexp: new RegExp(regexpString, "i"),
+          prefix: pattern.selector.substr(0, match.index),
+          suffix: pattern.selector.substr(match.index + match[0].length)
+        });
+      }
+
       callback();
     }.bind(this));
   },
 
   apply: function()
   {
     if (this.patterns.length > 0)
     {
       var document = this.window.document;
       this.addSelectors(document.styleSheets);
       document.addEventListener("load", this.onLoad.bind(this), true);
     }
   }
 };