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 72 matching lines @@
 exports.composeFilters = function(details)
 {
   let filters = [];
   let selectors = [];
 
   let page = details.page;
   let frame = details.frame;
 
   if (!isFrameWhitelisted(page, frame, RegExpFilter.typeMap.DOCUMENT))
   {
+    let typeMask = RegExpFilter.typeMap[details.type];
     let docDomain = extractHostFromFrame(frame);
-    let typeMask = RegExpFilter.typeMap[details.type];

[Sebastian Noack, 2015/07/13 16:41:50]

Nit: I'd declare the variables here in the order they are used.

[kzar, 2015/07/14 09:22:23]

Done.

 
     // 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, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
@@ skipping 30 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};
 };