Issue 154 - Added devtools panel showing blocked and blockable items

popupBlocker.js

Index: popupBlocker.js
===================================================================
--- a/popupBlocker.js
+++ b/popupBlocker.js
@@ -17,6 +17,7 @@
 
 if (require("info").platform == "chromium")
 {
+  var logRequest = require("devtools").logRequest;
   var tabsLoading = {};
 
   chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
@@ -35,10 +36,11 @@
                                           RegExpFilter.typeMap.GENERICBLOCK);
 
     tabsLoading[details.tabId] = {
+      page: sourcePage,
       documentHost: documentHost,
       specificOnly: specificOnly
     };
-    checkPotentialPopup(details.tabId, details.url, documentHost, specificOnly);
+    checkPotentialPopup(details.tabId, details.url, sourcePage, documentHost, specificOnly);

[kzar, 2016/01/31 13:33:53]

Nit: Mind wrapping this and the long line below?

   });
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
@@ -52,8 +54,9 @@
     if ("url" in changeInfo)
     {
       var source = tabsLoading[tabId];
-      checkPotentialPopup(tabId, tab.url, source.documentHost,
-                          source.specificOnly);
+      checkPotentialPopup(tabId, tab.url, source.page,
+                                          source.documentHost,
+                                          source.specificOnly);
     }
 
     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
@@ -61,16 +64,19 @@
   });
 }
 
-function checkPotentialPopup(tabId, url, documentHost, specificOnly)
+function checkPotentialPopup(tabId, url, sourcePage, documentHost, specificOnly)
 {
-  url = new URL(url || "about:blank");
+  var urlObj = new URL(url || "about:blank");

[kzar, 2016/01/31 13:33:52]

Shouldn't we put the `url ||  "about:blank"` workaround in the URL polyfill?
It's something that keeps coming up.

[Sebastian Noack, 2016/02/02 10:39:53]

Note that Chrome's native URL object treating '' as 'about:blank' is
non-standard, and inconsistent with Safari (and Firefox). Also even on Chrome
new URL(null) still fails.

[kzar, 2016/02/02 15:42:09]

IMO the polyfill should take care of those inconsistencies for us, but don't
want to delay this landing so won't argue it.

[Sebastian Noack, 2016/02/02 16:33:45]

A polyfill is a temporary solution, until browsers adapt. If anything, the
polyfill should wrap the native URL object on Chrome, to throw if an empty
string is passed, since this seems to be the standard behavior. However, that
wouldn't remove any complexity from the code here, but just adds some overhead
when URL objects are natively supported.

+  var urlString = stringifyURL(urlObj);
+  var thirdParty = isThirdParty(urlObj, documentHost);
 
   var filter = defaultMatcher.matchesAny(
-    stringifyURL(url), RegExpFilter.typeMap.POPUP,
-    documentHost, isThirdParty(url, documentHost),
-    null, specificOnly
+    urlString, RegExpFilter.typeMap.POPUP,
+    documentHost, thirdParty, null, specificOnly
   );
 
   if (filter instanceof BlockingFilter)
     chrome.tabs.remove(tabId);
+
+  logRequest(sourcePage, urlString, "POPUP",  documentHost, thirdParty, null, filter);
 }