Issue 7265 - Orgnanize request blocking filters by domain

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 853 matching lines @@
    * @param {string} [docDomain] domain name of the document that loads the URL
    * @param {boolean} [thirdParty] should be true if the URL is a third-party
    *                               request
    * @param {string} [sitekey] public key provided by the document
    * @return {boolean} true in case of a match
    */
   matches(location, typeMask, docDomain, thirdParty, sitekey)
   {
     return (this.contentType & typeMask) != 0 &&
            (this.thirdParty == null || this.thirdParty == thirdParty) &&
-           this.matchesLocation(location) &&
-           this.isActiveOnDomain(docDomain, sitekey);
+           (this.regexp ? (this.isActiveOnDomain(docDomain, sitekey) &&
+                           this.matchesLocation(location)) :
+             (this.matchesLocation(location) &&
+              this.isActiveOnDomain(docDomain, sitekey)));
   },
 
   /**
    * Checks whether the given URL matches this filter without checking the
    * filter's domains.
    * @param {string} location
    * @param {number} typeMask
    * @param {boolean} [thirdParty]
    * @param {string} [sitekey]
    * @return {boolean}
@@ skipping 558 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });