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
@@ skipping 70 matching lines @@
  *                  hiding filters: {filters: [...], selectors: [...]}
  */
 exports.composeFilters = function(details)
 {
   let filters = [];
   let selectors = [];
 
   let page = details.page;
   let frame = details.frame;
 
-  if (!isFrameWhitelisted(page, frame, "DOCUMENT"))
+  if (!isFrameWhitelisted(page, frame, RegExpFilter.typeMap.DOCUMENT))
   {
+    let typeMask = RegExpFilter.typeMap[details.type];
     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, 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.

+        url, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
         getKey(page, frame)
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
 
         if (filters.indexOf(filterText) == -1)
           filters.push(filterText);
       }
     }
 
     // If we couldn't generate any blocking filters, fallback to element hiding
     let selectors = [];
-    if (filters.length == 0 && !isFrameWhitelisted(page, frame, "ELEMHIDE"))
+    if (filters.length == 0 && !isFrameWhitelisted(page, frame, RegExpFilter.typeMap.ELEMHIDE))
     {
       // Generate CSS selectors based on the element's "id" and "class" attribute
       if (details.id)
         selectors.push("#" + escapeCSS(details.id));
       if (details.classes.length > 0)
         selectors.push(details.classes.map(c => "." + escapeCSS(c)).join(""));
 
       // If there is a "src" attribute, specifiying a URL that we can't block,
       // generate a CSS selector matching the "src" attribute
       if (details.src)
         selectors.push(escapeCSS(details.tagName) + "[src=" + quoteCSS(details.src) + "]");
 
       // As last resort, if there is a "style" attribute, and we couldn't generate
       // any filters so far, generate a CSS selector matching the "style" attribute
       if (details.style && selectors.length == 0 && filters.length == 0)
         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};
 };