Issue 616 - Enforce $generichide and $genericblock in Chrome

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 13 matching lines @@
     var sourcePage = new ext.Page({id: details.sourceTabId});
     var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
 
     if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame))
       return;
 
     var documentHost = extractHostFromFrame(sourceFrame);
     if (!documentHost)
       return;
 
-    var frame = sourceFrame;
-    var specificOnly = false;
-    while (frame && !specificOnly)
-    {
-      specificOnly = isFrameWhitelisted(sourcePage, frame, "GENERICBLOCK");
-      frame = frame.parent;
-    }
+    var specificOnly = isFrameWhitelisted(sourcePage, sourceFrame,
+                                          RegExpFilter.typeMap.GENERICBLOCK);
 
     tabsLoading[details.tabId] = {
       documentHost: documentHost,
       specificOnly: specificOnly
     };
-    checkPotentialPopup(details.tabId, details.url, specificOnly, documentHost);
+    checkPotentialPopup(details.tabId, details.url, documentHost, specificOnly);
   });
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
     if (!(tabId in tabsLoading))
     {
       // Not a pop-up we've previously seen
       return;
     }
 
     if ("url" in changeInfo)
     {
       var source = tabsLoading[tabId];
-      checkPotentialPopup(tabId, tab.url, source.specificOnly, source.documentHost);
+      checkPotentialPopup(tabId, tab.url, source.documentHost,
+                          source.specificOnly);
     }
 
     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
       delete tabsLoading[tabId];
   });
 }
 
-function checkPotentialPopup(tabId, url, specificOnly, documentHost)
+function checkPotentialPopup(tabId, url, documentHost, specificOnly)
 {
   url = new URL(url || "about:blank");
 
   var filter = defaultMatcher.matchesAny(
-    stringifyURL(url), "POPUP",
+    stringifyURL(url), RegExpFilter.typeMap.POPUP,
     documentHost, isThirdParty(url, documentHost),
-    undefined, specificOnly
+    null, specificOnly
   );
 
   if (filter instanceof BlockingFilter)
     chrome.tabs.remove(tabId);
 }