Issue 4329 - Add $generichide support

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 334 matching lines @@
     newSelector.push('[id=', selector.substring(pos.start + 1, pos.end), ']');
     i = pos.end;
   }
   newSelector.push(selector.substring(i));
 
   return newSelector.join("");
 }
 
 function addCSSRules(rules, selectors, matchDomain)
 {
-  if (!matchDomain)
-    matchDomain = "^https?://";
-
   while (selectors.length)

[Manish Jethani, 2017/05/17 14:54:04]

The rest of this function is a cut and paste from below.

   {
     let selector = selectors.splice(0, selectorLimit).join(", ");
 
     // As of Safari 9.0 element IDs are matched as lowercase. We work around
     // this by converting to the attribute format [id="elementID"]
     selector = convertIDSelectorsToAttributeSelectors(selector);
 
     rules.push({
       trigger: {"url-filter": matchDomain,
                 "url-filter-is-case-sensitive": true},
@@ skipping 33 matching lines @@
     return;
 
   if (filter instanceof filterClasses.BlockingFilter)
     this.requestFilters.push(filter);
 
   if (filter instanceof filterClasses.WhitelistFilter)
   {
     if (filter.contentType & (typeMap.DOCUMENT | whitelistableRequestTypes))
       this.requestExceptions.push(filter);
 
-      if (filter.contentType & typeMap.ELEMHIDE)
-        this.elemhideExceptions.push(filter);
-      else if (filter.contentType & typeMap.GENERICHIDE)
-        this.generichideExceptions.push(filter);
+    if (filter.contentType & typeMap.ELEMHIDE)
+      this.elemhideExceptions.push(filter);
+    else if (filter.contentType & typeMap.GENERICHIDE)
+      this.generichideExceptions.push(filter);
   }
 
   if (filter instanceof filterClasses.ElemHideFilter)
     this.elemhideFilters.push(filter);
 
   if (filter instanceof filterClasses.ElemHideException)
   {
     let domains = this.elemhideSelectorExceptions[filter.selector];
     if (!domains)
       domains = this.elemhideSelectorExceptions[filter.selector] = [];
@@ skipping 28 matching lines @@
     {
       for (let matchDomain of result.matchDomains)
       {
         let group = groupedElemhideFilters.get(matchDomain) || [];
         group.push(result.selector);
         groupedElemhideFilters.set(matchDomain, group);
       }
     }
   }
 
-  addCSSRules(rules, genericSelectors);

[kzar, 2017/05/19 12:12:22]

Just pass matchDomain of ^https?:// here, then remove the related logic in
addCSSRules?

+  addCSSRules(rules, genericSelectors, "^https?://");
 
   // Right after the generic element hiding filters, add the exceptions that
   // should apply only to those filters.
   for (let filter of this.generichideExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
 
   groupedElemhideFilters.forEach((selectors, matchDomain) =>
   {
     addCSSRules(rules, selectors, matchDomain);
   });
 
   for (let filter of this.elemhideExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
   for (let filter of this.requestFilters)
     convertFilterAddRules(rules, filter, "block", true);
   for (let filter of this.requestExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", true);
 
   return rules.filter(rule => !hasNonASCI(rule));
 };