Issue 6727 - Use string rather than map for single-domain filters

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 375 matching lines @@
   domainSeparator: null,
 
   /**
    * Determines whether domainSource is already upper-case,
    * can be overridden by subclasses.
    * @type {boolean}
    */
   domainSourceIsUpperCase: false,
 
   /**
-   * String specifying the domain that this filter should match on, or map
-   * containing domains that this filter should match on/not match on, or null
-   * if the filter should match on all domains
-   * @type {?Map.<string,boolean>|string}
+   * Map containing domains that this filter should match on/not match
+   * on or null if the filter should match on all domains
+   * @type {?Map.<string,boolean>}
    */
   get domains()
   {
     // Despite this property being cached, the getter is called
     // several times on Safari, due to WebKit bug 132872
-    let prop = Object.getOwnPropertyDescriptor(this, "domains");
+    let prop = Object.getOwnPropertyDescriptor(this, "_domains");
     if (prop)
-      return prop.value;
+    {
+      let {value} = prop;
+      return typeof value == "string" ?
+               new Map([[value, true], ["", false]]) : value;
+    }
 
     let domains = null;
 
     if (this.domainSource)
     {
       let source = this.domainSource;
       if (!this.domainSourceIsUpperCase)
       {
         // RegExpFilter already have uppercase domains
         source = source.toUpperCase();
@@ skipping 30 matching lines @@
 
           domains.set(domain, include);
         }
         if (domains)
           domains.set("", !hasIncludes);
       }
 
       this.domainSource = null;
     }
 
-    Object.defineProperty(this, "domains", {value: domains, enumerable: true});
+    Object.defineProperty(this, "_domains", {value: domains});
     return this.domains;
   },
 
   /**
    * Array containing public keys of websites that this filter should apply to
    * @type {?string[]}
    */
   sitekeys: null,
 
   /**
@@ skipping 13 matching lines @@
       return false;
     }
 
     // If no domains are set the rule matches everywhere
     if (!this.domains)
       return true;
 
     // If the document has no host name, match only if the filter
     // isn't restricted to specific domains
     if (!docDomain)
-      return typeof this.domains != "string" && this.domains.get("");
+      return this.domains.get("");
 
     docDomain = docDomain.replace(/\.+$/, "").toUpperCase();
-
-    if (typeof this.domains == "string")
-    {
-      return docDomain == this.domains ||
-             docDomain.endsWith("." + this.domains);
-    }
 
     while (true)
     {
       let isDomainIncluded = this.domains.get(docDomain);
       if (typeof isDomainIncluded != "undefined")
         return isDomainIncluded;
 
       let nextDot = docDomain.indexOf(".");
       if (nextDot < 0)
         break;
       docDomain = docDomain.substr(nextDot + 1);
     }
     return this.domains.get("");
   },
 
   /**
    * Checks whether this filter is active only on a domain and its subdomains.
    * @param {string} docDomain
    * @return {boolean}
    */
   isActiveOnlyOnDomain(docDomain)
   {
-    if (!docDomain || !this.domains ||
-        typeof this.domains != "string" && this.domains.get(""))
-    {
+    if (!docDomain || !this.domains || this.domains.get(""))
       return false;
-    }
 
     docDomain = docDomain.replace(/\.+$/, "").toUpperCase();
-
-    if (typeof this.domains == "string")
-    {
-      return docDomain == this.domains ||
-             this.domains.endsWith("." + docDomain);
-    }
 
     for (let [domain, isIncluded] of this.domains)
     {
       if (isIncluded && domain != docDomain)
       {
         if (domain.length <= docDomain.length)
           return false;
 
         if (!domain.endsWith("." + docDomain))
           return false;
       }
     }
 
     return true;
   },
 
   /**
    * Checks whether this filter is generic or specific
    * @return {boolean}
    */
   isGeneric()
   {
     return !(this.sitekeys && this.sitekeys.length) &&
-            (!this.domains ||
-             typeof this.domains != "string" && this.domains.get(""));
+            (!this.domains || this.domains.get(""));
   },
 
   /**
    * See Filter.serialize()
    * @inheritdoc
    */
   serialize(buffer)
   {
     if (this._disabled || this._hitCount || this._lastHit)
     {
@@ skipping 545 matching lines @@
  */
 function ElemHideEmulationFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideEmulationFilter = ElemHideEmulationFilter;
 
 ElemHideEmulationFilter.prototype = extend(ElemHideBase, {
   type: "elemhideemulation"
 });