Issue 5735 - Use JS Map instead of Object for filters which are stored in filtersByDomain in elem...

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 21 matching lines @@
 
 /**
  * Lookup table, keys of the filters by filter text
  * @type {Object}
  */
 let keyByFilter = Object.create(null);
 
 /**
  * Nested lookup table, filter (or false if inactive) by filter key by domain.
  * (Only contains filters that aren't unconditionally matched for all domains.)
- * @type {Map.<string,Object>}
+ * @type {Map.<string,Map.<string,(Filter|boolean)>>}
  */
 let filtersByDomain = new Map();
 
 /**
  * Lookup table, filter key by selector. (Only used for selectors that are
  * unconditionally matched for all domains.)
  */
 let filterKeyBySelector = Object.create(null);
 
 /**
@@ skipping 47 matching lines @@
     FilterNotifier.emit("elemhideupdate");
   },
 
   _addToFiltersByDomain(key, filter)
   {
     let domains = filter.domains || defaultDomains;
     for (let [domain, isIncluded] of domains)
     {
       let filters = filtersByDomain.get(domain);
       if (!filters)
-        filtersByDomain.set(domain, filters = Object.create(null));
-
-      if (isIncluded)
-        filters[key] = filter;
-      else
-        filters[key] = false;
+        filtersByDomain.set(domain, filters = new Map());
+      filters.set(key, isIncluded ? filter : false);
     }
   },
 
   /**
    * Add a new element hiding filter
    * @param {ElemHideFilter} filter
    */
   add(filter)
   {
     if (filter instanceof ElemHideException)
@@ skipping 52 matching lines @@
       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)
-        delete filters[key];
+        filters.delete(key);
     }
   },
 
   /**
    * Removes an element hiding filter
    * @param {ElemHideFilter} filter
    */
   remove(filter)
   {
     if (filter instanceof ElemHideException)
@@ skipping 159 matching lines @@
     let seenFilters = Object.create(null);
     let currentDomain = domain ? domain.toUpperCase() : "";
     while (true)
     {
       if (specificOnly && currentDomain == "")
         break;
 
       let filters = filtersByDomain.get(currentDomain);
       if (filters)
       {
-        for (let filterKey in filters)
+        for (let [filterKey, filter] of filters)
         {
           if (filterKey in seenFilters)
             continue;
           seenFilters[filterKey] = true;
 
-          let filter = filters[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;
   }
 };