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

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 Definition of Filter class and its subclasses.
  */
 
 let {FilterNotifier} = require("filterNotifier");
 let {extend} = require("coreUtils");
-let {elemHideEmulationFeatureMap, filterToRegExp} = require("common");
+let {filterToRegExp} = require("common");
 
 /**
  * Abstract base class for filters
  *
  * @param {String} text   string representation of the filter
  * @constructor
  */
 function Filter(text)
 {
   this.text = text;
@@ skipping 870 matching lines @@
 
   // We don't allow ElemHide filters which have any empty domains.
   // Note: The ElemHide.prototype.domainSeparator is duplicated here, if that
   // changes this must be changed too.
   if (domain && /(^|,)~?(,|$)/.test(domain))
     return new InvalidFilter(text, "filter_invalid_domain");
 
   if (isException)
     return new ElemHideException(text, domain, selector);
 
-  let emulatedFeatures = 0;
   if (selector.indexOf("[-abp-properties") != -1)
-    emulatedFeatures |= ElemHideEmulationFilter.featureMap.PROPERTY_SELECTOR;
-  if (selector.indexOf(":has(") != -1)
-    emulatedFeatures |= ElemHideEmulationFilter.featureMap.HAS_PSEUDO_CLASS;
-
-  if (emulatedFeatures != 0)

[Wladimir Palant, 2016/11/21 11:39:15]

Nit: `if (emulatedFeatures)`?

[Felix Dahlke, 2016/11/21 14:38:59]

Removed along with the feature bitmask.

   {
     // Element hiding emulation filters are inefficient so we need to make sure
     // that they're only applied if they specify active domains
     if (!/,[^~][^,.]*\.[^,]/.test("," + domain))
       return new InvalidFilter(text, "filter_elemhideemulation_nodomain");
 
-    return new ElemHideEmulationFilter(text, domain, selector,
-                                       emulatedFeatures);
+    return new ElemHideEmulationFilter(text, domain, selector);
   }
 
   return new ElemHideFilter(text, domain, selector);
 };
 
 /**
  * Class for element hiding filters
  * @param {String} text see Filter()
  * @param {String} domains  see ElemHideBase()
  * @param {String} selector see ElemHideBase()
@@ skipping 26 matching lines @@
 
 ElemHideException.prototype = extend(ElemHideBase, {
   type: "elemhideexception"
 });
 
 /**
  * Class for element hiding emulation filters
  * @param {String} text           see Filter()
  * @param {String} domains        see ElemHideBase()
  * @param {String} selector       see ElemHideBase()
- * @param {Integer} features      see ElemHideEmulationFilter.features
  * @constructor
  * @augments ElemHideBase
  */
-function ElemHideEmulationFilter(text, domains, selector, features)
+function ElemHideEmulationFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
-
-  this.features = features;
 }
 exports.ElemHideEmulationFilter = ElemHideEmulationFilter;
 
 ElemHideEmulationFilter.prototype = extend(ElemHideBase, {
-  type: "elemhideemulation",
-
-  /**
-   * Features used in this filter, combination of values from
-   * ElemHideEmulationFilter.featureMap
-   * @type Integer
-   */
-  features: 0
-});
-
-/**
- * @see elemHideEmulationFeatureMap
- */
-ElemHideEmulationFilter.featureMap = elemHideEmulationFeatureMap;
+  type: "elemhideemulation"
+});