Issue 154 - Added devtools panel showing blocked and blockable items

webrequest.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 FilterNotifier = require("filterNotifier").FilterNotifier;
 var platform = require("info").platform;
+var logRequest = require("devtools").logRequest;
 
 var onFilterChangeTimeout = null;
 function onFilterChange()
 {
   onFilterChangeTimeout = null;
   ext.webRequest.handlerBehaviorChanged();
 }
 
 var importantNotifications = {
   'filter.added': true,
@@ skipping 15 matching lines @@
       window.clearTimeout(onFilterChangeTimeout);
     onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
   }
 });
 
 function onBeforeRequest(url, type, page, frame)
 {
   if (isFrameWhitelisted(page, frame))
     return true;
 
+  var reqType = type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase();
   var docDomain = extractHostFromFrame(frame);
   var key = getKey(page, frame);
   var filter = defaultMatcher.matchesAny(
     url,
-    type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
+    reqType,
     docDomain,
     isThirdParty(extractHostFromURL(url), docDomain),
     key
   );
 
   // We can't listen to onHeadersReceived in Safari so we need to
   // check for notifications here
   if (platform != "chromium" && type == "sub_frame")
   {
     var notificationToShow = Notification.getNextToShow(url);
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
+  logRequest(page._id, url, reqType, docDomain, key, filter);
   FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
+
   return !(filter instanceof BlockingFilter);
 }
 
 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
 
 if (platform == "chromium")
 {
   function onHeadersReceived(details)
   {
     if (details.tabId == -1)
@@ skipping 15 matching lines @@
         processKey(header.value, page, frame);
     }
 
     var notificationToShow = Notification.getNextToShow(details.url);
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http://*/*", "https://*/*"]}, ["responseHeaders"]);
 }