Issue 4353 - Remove deprecated __proto__ syntax

lib/filterClasses.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 Filter class and its subclasses.
  */
 
 let {FilterNotifier} = require("filterNotifier");
-let {desc} = require("coreUtils");
+let {extend} = require("coreUtils");
 
 /**
  * Abstract base class for filters
  *
  * @param {String} text   string representation of the filter
  * @constructor
  */
 function Filter(text)
 {
   this.text = text;
@@ skipping 170 matching lines @@
  * @augments Filter
  */
 function InvalidFilter(text, reason)
 {
   Filter.call(this, text);
 
   this.reason = reason;
 }
 exports.InvalidFilter = InvalidFilter;
 
-InvalidFilter.prototype = Object.create(Filter.prototype, desc({
+InvalidFilter.prototype = extend(Filter, {
   type: "invalid",
 
   /**
    * Reason why this filter is invalid
    * @type String
    */
   reason: null,
 
   /**
    * See Filter.serialize()
    */
   serialize: function(buffer) {}
-}));
+});
 
 /**
  * Class for comments
  * @param {String} text see Filter()
  * @constructor
  * @augments Filter
  */
 function CommentFilter(text)
 {
   Filter.call(this, text);
 }
 exports.CommentFilter = CommentFilter;
 
-CommentFilter.prototype = Object.create(Filter.prototype, desc({
+CommentFilter.prototype = extend(Filter, {
   type: "comment",
 
   /**
    * See Filter.serialize()
    */
   serialize: function(buffer) {}
-}));
+});
 
 /**
  * Abstract base class for filters that can get hits
  * @param {String} text see Filter()
  * @param {String} [domains] Domains that the filter is restricted to separated by domainSeparator e.g. "foo.com|bar.com|~baz.com"
  * @constructor
  * @augments Filter
  */
 function ActiveFilter(text, domains)
 {
   Filter.call(this, text);
 
   this.domainSource = domains;
 }
 exports.ActiveFilter = ActiveFilter;
 
-ActiveFilter.prototype = Object.create(Filter.prototype, desc({
+ActiveFilter.prototype = extend(Filter, {
   _disabled: false,
   _hitCount: 0,
   _lastHit: 0,
 
   /**
    * Defines whether the filter is disabled
    * @type Boolean
    */
   get disabled()
   {
@@ skipping 224 matching lines @@
     {
       Filter.prototype.serialize.call(this, buffer);
       if (this._disabled)
         buffer.push("disabled=true");
       if (this._hitCount)
         buffer.push("hitCount=" + this._hitCount);
       if (this._lastHit)
         buffer.push("lastHit=" + this._lastHit);
     }
   }
-}));
+});
 
 /**
  * Abstract base class for RegExp-based filters
  * @param {String} text see Filter()
  * @param {String} regexpSource filter part that the regular expression should be build from
  * @param {Number} [contentType] Content types the filter applies to, combination of values from RegExpFilter.typeMap
  * @param {Boolean} [matchCase] Defines whether the filter should distinguish between lower and upper case letters
  * @param {String} [domains] Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
  * @param {Boolean} [thirdParty] Defines whether the filter should apply to third-party or first-party content only
  * @param {String} [sitekeys] Public keys of websites that this filter should apply to
@@ skipping 20 matching lines @@
     Object.defineProperty(this, "regexp", {value: regexp});
   }
   else
   {
     // No need to convert this filter to regular expression yet, do it on demand
     this.regexpSource = regexpSource;
   }
 }
 exports.RegExpFilter = RegExpFilter;
 
-RegExpFilter.prototype = Object.create(ActiveFilter.prototype, desc({
+RegExpFilter.prototype = extend(ActiveFilter, {
   /**
    * @see ActiveFilter.domainSourceIsUpperCase
    */
   domainSourceIsUpperCase: true,
 
   /**
    * Number of filters contained, will always be 1 (required to optimize Matcher).
    * @type Integer
    */
   length: 1,
@@ skipping 84 matching lines @@
   {
     if (this.contentType & typeMask &&
         (this.thirdParty == null || this.thirdParty == thirdParty) &&
         this.isActiveOnDomain(docDomain, sitekey) && this.regexp.test(location))
     {
       return true;
     }
 
     return false;
   }
-}));
+});
 
 // Required to optimize Matcher, see also RegExpFilter.prototype.length
 Object.defineProperty(RegExpFilter.prototype, "0",
 {
   get: function() { return this; }
 });
 
 /**
  * Creates a RegExp filter from its text representation
  * @param {String} text   same as in Filter()
@@ skipping 125 matching lines @@
  * @augments RegExpFilter
  */
 function BlockingFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys, collapse)
 {
   RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
 
   this.collapse = collapse;
 }
 exports.BlockingFilter = BlockingFilter;
 
-BlockingFilter.prototype = Object.create(RegExpFilter.prototype, desc({
+BlockingFilter.prototype = extend(RegExpFilter, {
   type: "blocking",
 
   /**
    * Defines whether the filter should collapse blocked content. Can be null (use the global preference).
    * @type Boolean
    */
   collapse: null
-}));
+});
 
 /**
  * Class for whitelist filters
  * @param {String} text see Filter()
  * @param {String} regexpSource see RegExpFilter()
  * @param {Number} contentType see RegExpFilter()
  * @param {Boolean} matchCase see RegExpFilter()
  * @param {String} domains see RegExpFilter()
  * @param {Boolean} thirdParty see RegExpFilter()
  * @param {String} sitekeys see RegExpFilter()
  * @constructor
  * @augments RegExpFilter
  */
 function WhitelistFilter(text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys)
 {
   RegExpFilter.call(this, text, regexpSource, contentType, matchCase, domains, thirdParty, sitekeys);
 }
 exports.WhitelistFilter = WhitelistFilter;
 
-WhitelistFilter.prototype = Object.create(RegExpFilter.prototype, desc({
+WhitelistFilter.prototype = extend(RegExpFilter, {
   type: "whitelist"
-}));
+});
 
 /**
  * Base class for element hiding filters
  * @param {String} text see Filter()
  * @param {String} [domains] Host names or domains the filter should be restricted to
  * @param {String} selector   CSS selector for the HTML elements that should be hidden
  * @constructor
  * @augments ActiveFilter
  */
 function ElemHideBase(text, domains, selector)
 {
   ActiveFilter.call(this, text, domains || null);
 
   if (domains)
     this.selectorDomain = domains.replace(/,~[^,]+/g, "").replace(/^~[^,]+,?/, "").toLowerCase();
   this.selector = selector;
 }
 exports.ElemHideBase = ElemHideBase;
 
-ElemHideBase.prototype = Object.create(ActiveFilter.prototype, desc({
+ElemHideBase.prototype = extend(ActiveFilter, {
   /**
    * @see ActiveFilter.domainSeparator
    */
   domainSeparator: ",",
 
   /**
    * @see ActiveFilter.ignoreTrailingDot
    */
   ignoreTrailingDot: false,
 
   /**
    * Host name or domain the filter should be restricted to (can be null for no restriction)
    * @type String
    */
   selectorDomain: null,
   /**
    * CSS selector for the HTML elements that should be hidden
    * @type String
    */
   selector: null
-}));
+});
 
 /**
  * Creates an element hiding filter from a pre-parsed text representation
  *
  * @param {String} text         same as in Filter()
  * @param {String} domain       domain part of the text representation (can be empty)
  * @param {Boolean} isException exception rule indicator
  * @param {String} tagName      tag name part (can be empty)
  * @param {String} attrRules    attribute matching rules (can be empty)
  * @param {String} selector     raw CSS selector (can be empty)
@@ skipping 64 matching lines @@
  * @param {String} selector see ElemHideBase()
  * @constructor
  * @augments ElemHideBase
  */
 function ElemHideFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideFilter = ElemHideFilter;
 
-ElemHideFilter.prototype = Object.create(ElemHideBase.prototype, desc({
+ElemHideFilter.prototype = extend(ElemHideBase, {
   type: "elemhide"
-}));
+});
 
 /**
  * Class for element hiding exceptions
  * @param {String} text see Filter()
  * @param {String} domains  see ElemHideBase()
  * @param {String} selector see ElemHideBase()
  * @constructor
  * @augments ElemHideBase
  */
 function ElemHideException(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideException = ElemHideException;
 
-ElemHideException.prototype = Object.create(ElemHideBase.prototype, desc({
+ElemHideException.prototype = extend(ElemHideBase, {
   type: "elemhideexception"
-}));
+});
 
 /**
  * Class for CSS property filters
  * @param {String} text           see Filter()
  * @param {String} domains        see ElemHideBase()
  * @param {String} selector       see ElemHideBase()
  * @param {String} regexpSource   see CSSPropertyFilter.regexpSource
  * @param {String} selectorPrefix see CSSPropertyFilter.selectorPrefix
  * @param {String} selectorSuffix see CSSPropertyFilter.selectorSuffix
  * @constructor
  * @augments ElemHideBase
  */
 function CSSPropertyFilter(text, domains, selector, regexpSource,
   selectorPrefix, selectorSuffix)
 {
   ElemHideBase.call(this, text, domains, selector);
 
   this.regexpSource = regexpSource;
   this.selectorPrefix = selectorPrefix;
   this.selectorSuffix = selectorSuffix;
 }
 exports.CSSPropertyFilter = CSSPropertyFilter;
 
-CSSPropertyFilter.prototype = Object.create(ElemHideBase.prototype, desc({
+CSSPropertyFilter.prototype = extend(ElemHideBase, {
   type: "cssproperty",
 
   /**
    * Expression from which a regular expression should be generated for matching
    * CSS properties - for delayed creation of the regexpString property
    * @type String
    */
   regexpSource: null,
   /**
    * Substring of CSS selector before properties for the HTML elements that
@@ skipping 18 matching lines @@
     // Despite this property being cached, the getter is called
     // several times on Safari, due to WebKit bug 132872
     let prop = Object.getOwnPropertyDescriptor(this, "regexpString");
     if (prop)
       return prop.value;
 
     let regexp = Filter.toRegExp(this.regexpSource);
     Object.defineProperty(this, "regexpString", {value: regexp});
     return regexp;
   }
-}));
+});