Issue 2738 - Pass bit masks to matching functions

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 /** @module filterComposer */
 
 let {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");
 let {getKey, isFrameWhitelisted} = require("whitelisting");
 let {defaultMatcher} = require("matcher");
+let {RegExpFilter} = require("filterClasses");
 
 function escapeChar(chr)
 {
   let code = chr.charCodeAt(0);
 
   // Control characters and leading digits must be escaped based on
   // their char code in CSS. Moreover, curly brackets aren't allowed
   // in elemhide filters, and therefore must be escaped based on their
   // char code as well.
   if (code <= 0x1F || code == 0x7F || /[\d\{\}]/.test(chr))
@@ skipping 58 matching lines @@
   {
     let docDomain = extractHostFromFrame(frame);
 
     // Add a blocking filter for each URL of the element that can be blocked
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
       url = stringifyURL(urlObj);
 
       let filter = defaultMatcher.whitelist.matchesAny(
-        url, details.type, docDomain,
+        url, RegExpFilter.toTypeMask(details.type), docDomain,

[Sebastian Noack, 2015/07/09 15:28:52]

Same here:

  let docDomain = extractHostFromFrame(frame);
  let typeMask = RegExpFilter.toTypeMask(details.type);

  for (let url of details.urls)
  {
     ..
     let filter = defaultMatcher.whitelist.matchesAny(
        url, typeMask, docDomain,
        isThirdParty(urlObj, docDomain),
        getKey(page, frame)
      );

[kzar, 2015/07/12 14:28:01]

Done.

         isThirdParty(urlObj, docDomain),
         getKey(page, frame)
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
 
         if (filters.indexOf(filterText) == -1)
           filters.push(filterText);
@@ skipping 21 matching lines @@
         selectors.push(escapeCSS(details.tagName) + "[style=" + quoteCSS(details.style) + "]");
 
       // Add an element hiding filter for each generated CSS selector
       for (let selector of selectors)
         filters.push(docDomain.replace(/^www\./, "") + "##" + selector);
     }
   }
 
   return {filters: filters, selectors: selectors};
 };