Issue 6562 - Remove the unused provideFilterKeys parameter

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 40 matching lines @@
 let filterKeyBySelector = new Map();
 
 /**
  * This array caches the keys of filterKeyBySelector table (selectors which
  * unconditionally apply on all domains). It will be null if the cache needs to
  * be rebuilt.
  */
 let unconditionalSelectors = null;
 
 /**
- * This array caches the values of filterKeyBySelector table (filterIds for
- * selectors which unconditionally apply on all domains). It will be null if the
- * cache needs to be rebuilt.
- */
-let unconditionalFilterKeys = null;
-
-/**
  * Object to be used instead when a filter has a blank domains property.
  */
 let defaultDomains = new Map([["", true]]);
 
 /**
  * Set containing known element hiding exceptions
  * @type {Set.<string>}
  */
 let knownExceptions = new Set();
 
@@ skipping 12 matching lines @@
    * Removes all known filters
    */
   clear()
   {
     for (let collection of [keyByFilter, filtersByDomain, filterKeyBySelector,
                             knownExceptions, exceptions])
     {
       collection.clear();
     }
     filterByKey = [];
-    unconditionalSelectors = unconditionalFilterKeys = null;
+    unconditionalSelectors = null;
     FilterNotifier.emit("elemhideupdate");
   },
 
   _addToFiltersByDomain(key, filter)
   {
     let domains = filter.domains || defaultDomains;
     for (let [domain, isIncluded] of domains)
     {
       let filters = filtersByDomain.get(domain);
       if (!filters)
@@ skipping 21 matching lines @@
         exceptions.set(selector, [filter]);
 
       // If this is the first exception for a previously unconditionally
       // applied element hiding selector we need to take care to update the
       // lookups.
       let filterKey = filterKeyBySelector.get(selector);
       if (typeof filterKey != "undefined")
       {
         this._addToFiltersByDomain(filterKey, filterByKey[filterKey]);
         filterKeyBySelector.delete(selector);
-        unconditionalSelectors = unconditionalFilterKeys = null;
+        unconditionalSelectors = null;
       }
 
       knownExceptions.add(filter.text);
     }
     else
     {
       if (keyByFilter.has(filter))
         return;
 
       let key = filterByKey.push(filter) - 1;
       keyByFilter.set(filter, key);
 
       if (!(filter.domains || exceptions.has(filter.selector)))
       {
         // The new filter's selector is unconditionally applied to all domains
         filterKeyBySelector.set(filter.selector, key);
-        unconditionalSelectors = unconditionalFilterKeys = null;
+        unconditionalSelectors = null;
       }
       else
       {
         // The new filter's selector only applies to some domains
         this._addToFiltersByDomain(key, filter);
       }
     }
 
     FilterNotifier.emit("elemhideupdate");
   },
 
   _removeFilterKey(key, filter)
   {
     if (filterKeyBySelector.get(filter.selector) == key)
     {
       filterKeyBySelector.delete(filter.selector);
-      unconditionalSelectors = unconditionalFilterKeys = null;
+      unconditionalSelectors = null;
       return;
     }
 
     // We haven't found this filter in unconditional filters, look in
     // filtersByDomain.
     let domains = filter.domains || defaultDomains;
     for (let domain of domains.keys())
     {
       let filters = filtersByDomain.get(domain);
       if (filters)
@@ skipping 95 matching lines @@
    * @returns {string[]}
    */
   getUnconditionalSelectors()
   {
     if (!unconditionalSelectors)
       unconditionalSelectors = [...filterKeyBySelector.keys()];
     return unconditionalSelectors.slice();
   },
 
   /**
-   * Returns a list of filter keys for selectors which apply to all websites
-   * without exception.
-   * @returns {number[]}
-   */
-  getUnconditionalFilterKeys()
-  {
-    if (!unconditionalFilterKeys)
-    {
-      let selectors = this.getUnconditionalSelectors();
-      unconditionalFilterKeys = [];
-      for (let selector of selectors)
-        unconditionalFilterKeys.push(filterKeyBySelector.get(selector));
-    }
-    return unconditionalFilterKeys.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. Optionally returns the corresponding filter
-   * keys.
+   * 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.
-   * @param {boolean} [provideFilterKeys]
-   *   If true, the function will return a list of corresponding filter keys in
-   *   addition to selectors.
-   * @returns {string[]|Array.<string[]>}
-   *   List of selectors or an array with two elements (list of selectors and
-   *   list of corresponding keys) if provideFilterKeys is true.
+   * @returns {string[]}
+   *   List of selectors.
    */
-  getSelectorsForDomain(domain, criteria, provideFilterKeys)
+  getSelectorsForDomain(domain, criteria)
   {
-    let filterKeys = [];
     let selectors = [];
 
     if (typeof criteria == "undefined")
       criteria = ElemHide.ALL_MATCHING;
     if (criteria < ElemHide.NO_UNCONDITIONAL)
-    {
       selectors = this.getUnconditionalSelectors();
-      if (provideFilterKeys)
-        filterKeys = this.getUnconditionalFilterKeys();
-    }
 
     let specificOnly = (criteria >= ElemHide.SPECIFIC_ONLY);
     let seenFilters = new Set();
     let currentDomain = domain ? domain.toUpperCase() : "";
     while (true)
     {
       if (specificOnly && currentDomain == "")
         break;
 
       let filters = filtersByDomain.get(currentDomain);
       if (filters)
       {
         for (let [filterKey, filter] of filters)
         {
           if (seenFilters.has(filterKey))
             continue;
           seenFilters.add(filterKey);
 
           if (filter && !this.getException(filter, domain))
-          {
             selectors.push(filter.selector);
-            // It is faster to always push the key, even if not required.
-            filterKeys.push(filterKey);
-          }
         }
       }
 
       if (currentDomain == "")
         break;
 
       let nextDot = currentDomain.indexOf(".");
       currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
     }
 
-    if (provideFilterKeys)
-      return [selectors, filterKeys];
     return selectors;
   }
 };