[adblockpluscore] Issue 4825 - Let ElemHideEmulation associate selector and filter when calling add…

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;
@@ skipping 55 matching lines @@
     {
       return new URL(stylesheet.href).origin == this.window.location.origin;
     }
     catch (e)
     {
       // Invalid URL, assume that it is first-party.
       return true;
     }
   },
 
-  findSelectors: function(stylesheet, selectors, filters)
+  findSelectors: function(stylesheet, filters)
   {
     // Explicitly ignore third-party stylesheets to ensure consistent behavior
     // between Firefox and Chrome.
     if (!this.isSameOrigin(stylesheet))
       return;
 
     var rules = stylesheet.cssRules;
     if (!rules)
       return;
 
     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];
         if (pattern.regexp.test(style))
         {
           var subSelectors = splitSelector(rule.selectorText);
+          var selectors = []

[Sebastian Noack, 2017/02/06 14:59:21]

Nit: Missing semicolon

[wspee, 2017/02/07 11:59:41]

Done.

+
           for (var k = 0; k < subSelectors.length; k++)
             selectors.push(pattern.prefix + subSelectors[k] + pattern.suffix);
-          filters[pattern.text] = true;
+
+          if (!(pattern.text in filters))
+            filters[pattern.text] = selectors;

[Sebastian Noack, 2017/02/06 14:59:21]

While changing the API here anyway, it might be a good opportunity to turn
filters into a Map() object, which according to our coding practices, is
preferred over misusing plain objects as hashtable, in modern code.

[wspee, 2017/02/07 11:59:41]

Done.

+          else
+            filters[pattern.text] = filters[pattern.text].concat(selectors);
         }
       }
     }
   },
 
   addSelectors: function(stylesheets)
   {
-    var selectors = [];
     var filters = {};
     for (var i = 0; i < stylesheets.length; i++)
-      this.findSelectors(stylesheets[i], selectors, filters);
-    this.addSelectorsFunc(selectors, Object.keys(filters));
+      this.findSelectors(stylesheets[i], filters);
+    this.addSelectorsFunc(filters);
   },
 
   onLoad: function(event)
   {
     var stylesheet = event.target.sheet;
     if (stylesheet)
       this.addSelectors([stylesheet]);
   },
 
   load: function(callback)
@@ skipping 32 matching lines @@
   apply: function()
   {
     if (this.patterns.length > 0)
     {
       var document = this.window.document;
       this.addSelectors(document.styleSheets);
       document.addEventListener("load", this.onLoad.bind(this), true);
     }
   }
 };