Issue 6652 - Do not push to unconditional selectors array

lib/elemHide.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 45 matching lines @@
  */
 let knownFilters = new Set();
 
 /**
  * Lookup table, lists of element hiding exceptions by selector
  * @type {Map.<string,Filter>}
  */
 let exceptions = new Map();
 
 /**
+ * Returns a list of selectors that apply on each website unconditionally.
+ * @returns {string[]}
+ */
+function getUnconditionalSelectors()
+{
+  if (!unconditionalSelectors)
+    unconditionalSelectors = [...filterBySelector.keys()];
+  return unconditionalSelectors;
+}
+
+/**
  * Container for element hiding filters
  * @class
  */
 let ElemHide = exports.ElemHide = {
   /**
    * Removes all known filters
    */
   clear()
   {
     for (let collection of [filtersByDomain, filterBySelector,
@@ skipping 121 matching lines @@
     for (let i = list.length - 1; i >= 0; i--)
     {
       if (list[i].isActiveOnDomain(docDomain))
         return list[i];
     }
 
     return null;
   },
 
   /**
-   * Returns a list of selectors that apply on each website unconditionally.
-   * @returns {string[]}
-   */
-  getUnconditionalSelectors()
-  {
-    if (!unconditionalSelectors)
-      unconditionalSelectors = [...filterBySelector.keys()];
-    return unconditionalSelectors.slice();
-  },
-
-  /**
    * Constant used by getSelectorsForDomain to return all selectors applying to
    * a particular hostname.
    */
   ALL_MATCHING: 0,
 
   /**
    * Constant used by getSelectorsForDomain to exclude selectors which apply to
    * all websites without exception.
    */
   NO_UNCONDITIONAL: 1,
 
   /**
    * Constant used by getSelectorsForDomain to return only selectors for filters
    * which specifically match the given host name.
    */
   SPECIFIC_ONLY: 2,
 
   /**
    * Determines from the current filter list which selectors should be applied
    * on a particular host name.
    * @param {string} domain
    * @param {number} [criteria]
    *   One of the following: ElemHide.ALL_MATCHING, ElemHide.NO_UNCONDITIONAL or
    *                         ElemHide.SPECIFIC_ONLY.
    * @returns {string[]}
    *   List of selectors.
    */
-  getSelectorsForDomain(domain, criteria)
+  getSelectorsForDomain(domain, criteria = ElemHide.ALL_MATCHING)

[Manish Jethani, 2018/05/08 17:34:25]

This is the modern way of specifying default values for parameters.

   {
     let selectors = [];
 
-    if (typeof criteria == "undefined")
-      criteria = ElemHide.ALL_MATCHING;
-    if (criteria < ElemHide.NO_UNCONDITIONAL)
-      selectors = this.getUnconditionalSelectors();
+    let specificOnly = criteria >= ElemHide.SPECIFIC_ONLY;
 
-    let specificOnly = (criteria >= ElemHide.SPECIFIC_ONLY);
     let excluded = new Set();
     let currentDomain = domain ? domain.toUpperCase() : "";
 
     // This code is a performance hot-spot, which is why we've made certain
     // micro-optimisations. Please be careful before making changes.
     while (true)
     {
       if (specificOnly && currentDomain == "")
         break;
 
@@ skipping 14 matching lines @@
         }
       }
 
       if (currentDomain == "")
         break;
 
       let nextDot = currentDomain.indexOf(".");
       currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
     }
 
+    if (criteria < ElemHide.NO_UNCONDITIONAL)
+      selectors = getUnconditionalSelectors().concat(selectors);
+
     return selectors;
   }
 };