Issue 154 - Added devtools panel showing blocked and blockable items

popupBlocker.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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/>.
  */
 
+var logRequest = require("devtools").logRequest;
+
 if (require("info").platform == "chromium")
 {
   var tabsLoading = {};
 
   chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
   {
     var sourcePage = new ext.Page({id: details.sourceTabId});
     var sourceFrame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
 
     if (!sourceFrame || isFrameWhitelisted(sourcePage, sourceFrame))
       return;
 
     var openerUrl = sourceFrame.url;
     if (!openerUrl)
     {
       // We don't know the opener tab
       return;
     }
-    tabsLoading[details.tabId] = openerUrl;
+    tabsLoading[details.tabId] = {tabId: details.sourceTabId, url: openerUrl};
 
-    checkPotentialPopup(details.tabId, details.url, openerUrl);
+    checkPotentialPopup(details.tabId, details.url, details.sourceTabId, openerUrl);
   });
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
-    if (!(tabId in tabsLoading))
-    {
-      // Not a pop-up we've previously seen
+    var opener = tabsLoading[tabId];
+    if (!opener)
       return;
-    }
 
     if ("url" in changeInfo)
-      checkPotentialPopup(tabId, tab.url, tabsLoading[tabId]);
+      checkPotentialPopup(tabId, tab.url, opener.tabId, opener.url);
 
     if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
       delete tabsLoading[tabId];
   });
 }
 
-function checkPotentialPopup(tabId, url, opener)
+function checkPotentialPopup(tabId, url, openerTabId, openerUrl)
 {
   var requestHost = extractHostFromURL(url);
-  var documentHost = extractHostFromURL(opener);
+  var documentHost = extractHostFromURL(openerUrl);
   var thirdParty = isThirdParty(requestHost, documentHost);
-  var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", documentHost, thirdParty);
+
+  if (!url)
+    url = "about:blank";
+
+  var filter = defaultMatcher.matchesAny(url, "POPUP", documentHost, thirdParty);
   if (filter instanceof BlockingFilter)
     chrome.tabs.remove(tabId);
+
+  logRequest(openerTabId, url, "POPUP",  documentHost, null, filter);
 }