Issue 2738 - Pass bit masks to matching functions

popupBlocker.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 38 matching lines @@
     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
       delete tabsLoading[tabId];
   });
 }
 
 function checkPotentialPopup(tabId, url, documentHost)
 {
   url = new URL(url || "about:blank");
 
   var filter = defaultMatcher.matchesAny(
-    stringifyURL(url), RegExpFilter.toTypeMask("POPUP"),
+    stringifyURL(url), RegExpFilter.typeMap.POPUP,
     documentHost, isThirdParty(url, documentHost)
   );
 
   if (filter instanceof BlockingFilter)
     chrome.tabs.remove(tabId);
 }