Issue 7046 - Defer caching of domain maps

lib/filterClasses.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 439 matching lines @@
    * Map containing domains that this filter should match on/not match
    * on or null if the filter should match on all domains
    * @type {?Map.<string,boolean>}
    */
   get domains()
   {
     let domains = null;
 
     if (this.domainSource)
     {
+      // For some filter types this property is accessed only rarely,
+      // especially when the subscriptions are initially loaded. We defer any
+      // caching for such filters.
+      let cacheValue = this.shouldCacheDomains();
+
       let source = this.domainSource.toLowerCase();
 
       let knownMap = knownDomainMaps.get(source);
       if (knownMap)
       {
         domains = knownMap;
       }
       else
       {
         let list = source.split(this.domainSeparator);
@@ skipping 26 matching lines @@
             if (!domains)
               domains = new Map();
 
             domains.set(domain, include);
           }
 
           if (domains)
             domains.set("", !hasIncludes);
         }
 
-        if (domains)
+        if (!domains || cacheValue)
           knownDomainMaps.set(source, domains);
       }
 
-      this.domainSource = null;
+      if (!domains || cacheValue)
+      {
+        this.domainSource = null;
+        Object.defineProperty(this, "domains", {value: domains});
+      }
     }
 
-    Object.defineProperty(this, "domains", {value: domains});
-    return this.domains;
+    return domains;
+  },
+
+  /**
+   * Whether the value of {@link ActiveFilter#domains} should be cached. This
+   * is meant to be overridden by subclasses that don't want the value to be
+   * cached (for better memory usage).
+   * @return {boolean} Always <code>true</code>, but may be overriden by
+   *   subclasses.
+   * @protected
+   */
+  shouldCacheDomains()
+  {
+    return true;
   },
 
   /**
    * Array containing public keys of websites that this filter should apply to
    * @type {?string[]}
    */
   sitekeys: null,
 
   /**
    * Checks whether this filter is active on a domain.
@@ skipping 622 matching lines @@
  * @augments ContentFilter
  */
 function ElemHideBase(text, domains, selector)
 {
   ContentFilter.call(this, text, domains, selector);
 }
 exports.ElemHideBase = ElemHideBase;
 
 ElemHideBase.prototype = extend(ContentFilter, {
   /**
+   * Whether {@link ActiveFilter#domains} has been accessed at least once.
+   * @type {boolean}
+   * @private
+   */
+  _domainsAccessed: false,
+
+  /**
+   * See ActiveFilter.domains
+   * @inheritdoc
+   */
+  get domains()
+  {
+    let {get} = Object.getOwnPropertyDescriptor(ActiveFilter.prototype,
+                                                "domains");
+    let value = get.call(this);
+    this._domainsAccessed = true;
+    return value;
+  },
+
+  /**
+   * See ActiveFilter.shouldCacheDomains()
+   * @inheritdoc
+   */
+  shouldCacheDomains()
+  {
+    return this._domainsAccessed;
+  },
+
+  /**
    * CSS selector for the HTML elements that should be hidden
    * @type {string}
    */
   get selector()
   {
     // Braces are being escaped to prevent CSS rule injection.
     return this.body.replace("{", "\\7B ").replace("}", "\\7D ");
   }
 });
 
@@ skipping 70 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });