Issue 4353 - Remove deprecated __proto__ syntax

lib/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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/>.
  */
 
 /**
  * @fileOverview Definition of Subscription class and its subclasses.
  */
 
 let {ActiveFilter, BlockingFilter, WhitelistFilter, ElemHideBase} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
-let {desc} = require("coreUtils");
+let {desc, 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 188 matching lines @@
  * @param {String} [title]  see Subscription()
  * @constructor
  * @augments Subscription
  */
 function SpecialSubscription(url, title)
 {
   Subscription.call(this, url, title);
 }
 exports.SpecialSubscription = SpecialSubscription;
 
-SpecialSubscription.prototype = Object.create(Subscription.prototype, desc({
+SpecialSubscription.prototype = extend(Subscription, {
   /**
    * Filter types that should be added to this subscription by default
    * (entries should correspond to keys in SpecialSubscription.defaultsMap).
    * @type string[]
    */
   defaults: null,
 
   /**
    * Tests whether a filter should be added to this group by default
    * @param {Filter} filter filter to be tested
@@ skipping 19 matching lines @@
    * See Subscription.serialize()
    */
   serialize: function(buffer)
   {
     Subscription.prototype.serialize.call(this, buffer);
     if (this.defaults && this.defaults.length)
       buffer.push("defaults=" + this.defaults.filter((type) => type in SpecialSubscription.defaultsMap).join(" "));
     if (this._lastDownload)
       buffer.push("lastDownload=" + this._lastDownload);
   }
-}));
+});
 
 SpecialSubscription.defaultsMap = Object.create(null, desc({
   "whitelist": WhitelistFilter,
   "blocking": BlockingFilter,
   "elemhide": ElemHideBase
 }));
 
 /**
  * Creates a new user-defined filter group.
  * @param {String} [title]  title of the new filter group
@@ skipping 33 matching lines @@
  * @param {String} [title]  see Subscription()
  * @constructor
  * @augments Subscription
  */
 function RegularSubscription(url, title)
 {
   Subscription.call(this, url, title || url);
 }
 exports.RegularSubscription = RegularSubscription;
 
-RegularSubscription.prototype = Object.create(Subscription.prototype, desc({
+RegularSubscription.prototype = extend(Subscription, {
   _homepage: null,
   _lastDownload: 0,
 
   /**
    * Filter subscription homepage if known
    * @type String
    */
-  homepage: {
-    get: function()
-    {
-      return this._homepage;
-    },
-    set: function(value)
-    {
-      if (value != this._homepage)
-      {
-        let oldValue = this._homepage;
-        this._homepage = value;
-        FilterNotifier.triggerListeners("subscription.homepage", this, value, oldValue);
-      }
-      return this._homepage;
-    }
+  get homepage()
+  {
+    return this._homepage;
+  },
+  set homepage(value)
+  {
+    if (value != this._homepage)
+    {
+      let oldValue = this._homepage;
+      this._homepage = value;
+      FilterNotifier.triggerListeners("subscription.homepage", this, value, oldValue);
+    }
+    return this._homepage;
   },
 
   /**
    * Time of the last subscription download (in seconds since the beginning of the epoch)
    * @type Number
    */
-  lastDownload: {
-    get: function()
-    {
-      return this._lastDownload;
-    },
-    set: function(value)
-    {
-      if (value != this._lastDownload)
-      {
-        let oldValue = this._lastDownload;
-        this._lastDownload = value;
-        FilterNotifier.triggerListeners("subscription.lastDownload", this, value, oldValue);
-      }
-      return this._lastDownload;
-    }
+  get lastDownload()
+  {
+    return this._lastDownload;
+  },
+  set lastDownload(value)
+  {
+    if (value != this._lastDownload)
+    {
+      let oldValue = this._lastDownload;
+      this._lastDownload = value;
+      FilterNotifier.triggerListeners("subscription.lastDownload", this, value, oldValue);
+    }
+    return this._lastDownload;
   },
 
   /**
    * See Subscription.serialize()
    */
   serialize: function(buffer)
   {
     Subscription.prototype.serialize.call(this, buffer);
     if (this._homepage)
       buffer.push("homepage=" + this._homepage);
     if (this._lastDownload)
       buffer.push("lastDownload=" + this._lastDownload);
   }
-}));
+});
 
 /**
  * Class for filter subscriptions updated externally (by other extension)
  * @param {String} url    see Subscription()
  * @param {String} [title]  see Subscription()
  * @constructor
  * @augments RegularSubscription
  */
 function ExternalSubscription(url, title)
 {
   RegularSubscription.call(this, url, title);
 }
 exports.ExternalSubscription = ExternalSubscription;
 
-ExternalSubscription.prototype = Object.create(RegularSubscription.prototype, desc({
+ExternalSubscription.prototype = extend(RegularSubscription, {
   /**
    * See Subscription.serialize()
    */
   serialize: function(buffer)
   {
     throw new Error("Unexpected call, external subscriptions should not be serialized");
   }
-}));
+});
 
 /**
  * Class for filter subscriptions updated externally (by other extension)
  * @param {String} url  see Subscription()
  * @param {String} [title]  see Subscription()
  * @constructor
  * @augments RegularSubscription
  */
 function DownloadableSubscription(url, title)
 {
   RegularSubscription.call(this, url, title);
 }
 exports.DownloadableSubscription = DownloadableSubscription;
 
-DownloadableSubscription.prototype = Object.create(RegularSubscription.prototype, desc({
+DownloadableSubscription.prototype = extend(RegularSubscription, {
   _downloadStatus: null,
   _lastCheck: 0,
   _errors: 0,
 
   /**
    * Status of the last download (ID of a string)
    * @type String
    */
-  downloadStatus: {
-    get: function()
-    {
-      return this._downloadStatus;
-    },
-    set: function(value)
-    {
-      let oldValue = this._downloadStatus;
-      this._downloadStatus = value;
-      FilterNotifier.triggerListeners("subscription.downloadStatus", this, value, oldValue);
-      return this._downloadStatus;
-    }
+  get downloadStatus()
+  {
+    return this._downloadStatus;
+  },
+  set downloadStatus(value)
+  {
+    let oldValue = this._downloadStatus;
+    this._downloadStatus = value;
+    FilterNotifier.triggerListeners("subscription.downloadStatus", this, value, oldValue);
+    return this._downloadStatus;
   },
 
   /**
    * Time of the last successful download (in seconds since the beginning of the
    * epoch).
    */
   lastSuccess: 0,
 
   /**
    * Time when the subscription was considered for an update last time (in seconds
    * since the beginning of the epoch). This will be used to increase softExpiration
    * if the user doesn't use Adblock Plus for some time.
    * @type Number
    */
-  lastCheck: {
-    get: function()
-    {
-      return this._lastCheck;
-    },
-    set: function(value)
-    {
-      if (value != this._lastCheck)
-      {
-        let oldValue = this._lastCheck;
-        this._lastCheck = value;
-        FilterNotifier.triggerListeners("subscription.lastCheck", this, value, oldValue);
-      }
-      return this._lastCheck;
-    }
+  get lastCheck()
+  {
+    return this._lastCheck;
+  },
+  set lastCheck(value)
+  {
+    if (value != this._lastCheck)
+    {
+      let oldValue = this._lastCheck;
+      this._lastCheck = value;
+      FilterNotifier.triggerListeners("subscription.lastCheck", this, value, oldValue);
+    }
+    return this._lastCheck;
   },
 
   /**
    * Hard expiration time of the filter subscription (in seconds since the beginning of the epoch)
    * @type Number
    */
   expires: 0,
 
   /**
    * Soft expiration time of the filter subscription (in seconds since the beginning of the epoch)
    * @type Number
    */
   softExpiration: 0,
 
   /**
    * Number of download failures since last success
    * @type Number
    */
-  errors: {
-    get: function()
-    {
-      return this._errors;
-    },
-    set: function(value)
-    {
-      if (value != this._errors)
-      {
-        let oldValue = this._errors;
-        this._errors = value;
-        FilterNotifier.triggerListeners("subscription.errors", this, value, oldValue);
-      }
-      return this._errors;
-    }
+  get errors()
+  {
+    return this._errors;
+  },
+  set errors(value)
+  {
+    if (value != this._errors)
+    {
+      let oldValue = this._errors;
+      this._errors = value;
+      FilterNotifier.triggerListeners("subscription.errors", this, value, oldValue);
+    }
+    return this._errors;
   },
 
   /**
    * Version of the subscription data retrieved on last successful download
    * @type Number
    */
   version: 0,
 
   /**
    * Minimal Adblock Plus version required for this subscription
@@ skipping 25 matching lines @@
       buffer.push("softExpiration=" + this.softExpiration);
     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);
   }
-}));
+});