Issue 6543 - Match requests without tabId/frameId in their originating context

lib/popupBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 30 matching lines @@
 }
 
 function checkPotentialPopup(tabId, popup)
 {
   let urlObj = new URL(popup.url || "about:blank");
   let urlString = stringifyURL(urlObj);
   let documentHost = extractHostFromFrame(popup.sourceFrame);
   let thirdParty = isThirdParty(urlObj, documentHost);
 
   let specificOnly = !!checkWhitelisted(
-    popup.sourcePage, popup.sourceFrame,
+    popup.sourcePage, popup.sourceFrame, null,
     RegExpFilter.typeMap.GENERICBLOCK
   );
 
   let filter = defaultMatcher.matchesAny(
     urlString, RegExpFilter.typeMap.POPUP,
     documentHost, thirdParty, null, specificOnly
   );
 
   if (filter instanceof BlockingFilter)
     browser.tabs.remove(tabId);
@@ skipping 61 matching lines @@
     {
       forgetPopup(details.tabId);
     }
     else
     {
       popup.sourceFrame = frame;
       checkPotentialPopup(details.tabId, popup);
     }
   });
 }