Issue 2738 - Pass bit masks to matching functions

background.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/>.
  */
 
 with(require("filterClasses"))
 {
   this.Filter = Filter;
   this.BlockingFilter = BlockingFilter;
   this.WhitelistFilter = WhitelistFilter;
+  this.RegExpFilter = RegExpFilter;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.DownloadableSubscription = DownloadableSubscription;
   this.SpecialSubscription = SpecialSubscription;
 }
 with(require("whitelisting"))
 {
   this.isPageWhitelisted = isPageWhitelisted;
@@ skipping 300 matching lines @@
         break;
       }
 
       var documentHost = extractHostFromFrame(sender.frame);
       var blocked = false;
 
       for (var i = 0; i < msg.urls.length; i++)
       {
         var url = new URL(msg.urls[i], msg.baseURL);
         var filter = defaultMatcher.matchesAny(
-          stringifyURL(url), msg.mediatype,
+          stringifyURL(url), RegExpFilter.toTypeMask(msg.mediatype),

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

This operation can be done outside of the loop.

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

Done.

           documentHost, isThirdParty(url, documentHost)
         );
 
         if (filter instanceof BlockingFilter)
         {
           if (filter.collapse != null)
           {
             sendResponse(filter.collapse);
             return;
           }
@@ skipping 68 matching lines @@
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });