Issue 6559 - Change SpecialSubscription.defaultsMap to Map object

lib/subscriptionClasses.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
  * 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/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Definition of Subscription class and its subclasses.
  */
 
 const {ActiveFilter, BlockingFilter,
        WhitelistFilter, ElemHideBase} = require("./filterClasses");
 const {FilterNotifier} = require("./filterNotifier");
-const {desc, extend} = require("./coreUtils");
+const {extend} = require("./coreUtils");
 
 /**
  * Abstract base class for filter subscriptions
  *
  * @param {string} url    download location of the subscription
  * @param {string} [title]  title of the filter subscription
  * @constructor
  */
 function Subscription(url, title)
 {
@@ skipping 215 matching lines @@
    * Tests whether a filter should be added to this group by default
    * @param {Filter} filter filter to be tested
    * @return {boolean}
    */
   isDefaultFor(filter)
   {
     if (this.defaults && this.defaults.length)
     {
       for (let type of this.defaults)
       {
-        if (filter instanceof SpecialSubscription.defaultsMap[type])
+        if (filter instanceof SpecialSubscription.defaultsMap.get(type))
           return true;
         if (!(filter instanceof ActiveFilter) && type == "blacklist")
           return true;
       }
     }
 
     return false;
   },
 
   /**
    * See Subscription.serialize()
    * @inheritdoc
    */
   serialize(buffer)
   {
     Subscription.prototype.serialize.call(this, buffer);
     if (this.defaults && this.defaults.length)
     {
       buffer.push("defaults=" +
         this.defaults.filter(
-          type => type in SpecialSubscription.defaultsMap
+          type => SpecialSubscription.defaultsMap.has(type)
         ).join(" ")
       );
     }
     if (this._lastDownload)
       buffer.push("lastDownload=" + this._lastDownload);
   }
 });
 
-SpecialSubscription.defaultsMap = Object.create(null, desc({
-  whitelist: WhitelistFilter,
-  blocking: BlockingFilter,
-  elemhide: ElemHideBase
-}));
+SpecialSubscription.defaultsMap = new Map([
+  ["whitelist", WhitelistFilter],
+  ["blocking", BlockingFilter],
+  ["elemhide", ElemHideBase]
+]);
 
 /**
  * Creates a new user-defined filter group.
  * @param {string} [title]  title of the new filter group
  * @return {SpecialSubscription}
  */
 SpecialSubscription.create = function(title)
 {
   let url;
   do
   {
     url = "~user~" + Math.round(Math.random() * 1000000);
   } while (Subscription.knownSubscriptions.has(url));
   return new SpecialSubscription(url, title);
 };
 
 /**
  * Creates a new user-defined filter group and adds the given filter to it.
  * This group will act as the default group for this filter type.
  * @param {Filter} filter
  * @return {SpecialSubscription}
  */
 SpecialSubscription.createForFilter = function(filter)
 {
   let subscription = SpecialSubscription.create();
   subscription.filters.push(filter);
-  for (let type in SpecialSubscription.defaultsMap)
+  for (let [type, class_] of SpecialSubscription.defaultsMap)
   {
-    if (filter instanceof SpecialSubscription.defaultsMap[type])
+    if (filter instanceof class_)
       subscription.defaults = [type];
   }
   if (!subscription.defaults)
     subscription.defaults = ["blocking"];
   return subscription;
 };
 
 /**
  * Abstract base class for regular filter subscriptions (both
  * internally and externally updated)
@@ skipping 229 matching lines @@
     if (this.errors)
       buffer.push("errors=" + this.errors);
     if (this.version)
       buffer.push("version=" + this.version);
     if (this.requiredVersion)
       buffer.push("requiredVersion=" + this.requiredVersion);
     if (this.downloadCount)
       buffer.push("downloadCount=" + this.downloadCount);
   }
 });