Issue 2738 - Pass bit masks to matching functions

lib/filterComposer.js

Index: lib/filterComposer.js
diff --git a/lib/filterComposer.js b/lib/filterComposer.js
index 1eb31b9bc075ee67c5e6250f0089803616f155bc..e3b694285cd63e832cd8826f0f5049e799c6a664 100644
--- a/lib/filterComposer.js
+++ b/lib/filterComposer.js
@@ -20,6 +20,7 @@
 let {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");
 let {getKey, isFrameWhitelisted} = require("whitelisting");
 let {defaultMatcher} = require("matcher");
+let {RegExpFilter} = require("filterClasses");
 
 function escapeChar(chr)
 {
@@ -98,7 +99,7 @@ exports.composeFilters = function(details)
       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)
       );