Issue 7003 - Look up whitelist filter only if URL is blocked

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 315 matching lines @@
                      specificOnly)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
       candidates = [];
     candidates.push("");
 
     let whitelistHit = null;
     let blacklistHit = null;
 
+    // If the type mask includes no types other than whitelist-only types, we
+    // can skip the blacklist.
     if ((typeMask & ~WHITELIST_ONLY_TYPES) != 0)

[Manish Jethani, 2018/10/21 15:00:23]

If the type mask includes no types other than DOCUMENT, ELEMHIDE, GENERICHIDE,
and GENERICBLOCK, we can skip the blacklist.

     {
-      for (let i = 0, l = candidates.length; i < l; i++)
+      for (let i = 0, l = candidates.length; !blacklistHit && i < l; i++)
       {
-        let substr = candidates[i];
-        blacklistHit = this.blacklist._checkEntryMatch(
-          substr, location, typeMask, docDomain, thirdParty, sitekey,
-          specificOnly
-        );
-        if (blacklistHit)
-          break;
+        blacklistHit = this.blacklist._checkEntryMatch(candidates[i], location,
+                                                       typeMask, docDomain,
+                                                       thirdParty, sitekey,
+                                                       specificOnly);
       }
     }
 
+    // If the type mask includes any whitelist-only types, we need to check the
+    // whitelist.
     if (blacklistHit || (typeMask & WHITELIST_ONLY_TYPES) != 0)

[Manish Jethani, 2018/10/21 15:00:22]

If the type mask includes DOCUMENT, ELEMHIDE, GENERICHIDE, or GENERICBLOCK, we
need to check the whitelist.

     {
-      for (let i = 0, l = candidates.length; i < l; i++)
+      for (let i = 0, l = candidates.length; !whitelistHit && i < l; i++)
       {
-        let substr = candidates[i];
-        whitelistHit = this.whitelist._checkEntryMatch(
-          substr, location, typeMask, docDomain, thirdParty, sitekey
-        );
-        if (whitelistHit)
-          break;
+        whitelistHit = this.whitelist._checkEntryMatch(candidates[i], location,
+                                                       typeMask, docDomain,
+                                                       thirdParty, sitekey);
       }
     }
 
     return whitelistHit || blacklistHit;
   }
 
   /**
    * @see Matcher#matchesAny
    * @inheritdoc
    */
@@ skipping 20 matching lines @@
 
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Shared {@link CombinedMatcher} instance that should usually be used.
  * @type {CombinedMatcher}
  */
 let defaultMatcher = new CombinedMatcher();
 
 exports.defaultMatcher = defaultMatcher;