Issue 6994 - Use shortcut matching for location only filters

lib/matcher.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 154 matching lines @@
    * @param {boolean} [specificOnly]
    * @returns {?Filter}
    */
   _checkEntryMatch(keyword, location, typeMask, docDomain, thirdParty, sitekey,
                    specificOnly)
   {
     let set = this.filterByKeyword.get(keyword);
     if (typeof set == "undefined")
       return null;
 
     for (let filter of set)

[Manish Jethani, 2018/10/13 13:28:45]

The idea was to have two loops, one for the location-only filters and one for
the regular filters. For this, we would have to maintain the location-only
filters in a separate set, per keyword.

I would start by adding the following method to the `RegExpFilter` class:

  isLocationOnly()
  {
    return this.contentType == RegExpFilter.prototype.contentType &&
           this.thirdParty == null && !this.domains && !this.sitekeys;
  }

[Jon Sonesen, 2018/10/20 23:07:55]

Ack

     {
+      if (typeMask == 0)
+        continue;
+
       if (specificOnly && filter.isGeneric() &&
           !(filter instanceof WhitelistFilter))
         continue;
 
+      if (!sitekey || !docDomain || !thirdParty)
+      {

[Manish Jethani, 2018/10/13 13:28:45]

This seems wrong.

[Jon Sonesen, 2018/10/20 23:07:55]

Yeah, super wrong. My bad

+        if (filter.matches(location))
+          return filter;
+      }
+
       if (filter.matches(location, typeMask, docDomain, thirdParty, sitekey))
         return filter;
     }
     return null;
   }
 
   /**
    * Tests whether the URL matches any of the known filters
    * @param {string} location
    *   URL to be tested
@@ skipping 176 matching lines @@
 
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Shared {@link CombinedMatcher} instance that should usually be used.
  * @type {CombinedMatcher}
  */
 let defaultMatcher = new CombinedMatcher();
 
 exports.defaultMatcher = defaultMatcher;