Issue 154 - Added devtools panel showing blocked and blockable items

webrequest.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 RegExpFilter = require("filterClasses").RegExpFilter;
 var platform = require("info").platform;
+var devtools = require("devtools");
 
 ext.webRequest.getIndistinguishableTypes().forEach(function(types)
 {
   for (var i = 1; i < types.length; i++)
     RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
 });
 
 FilterNotifier.addListener(function(action, arg)
 {
   switch (action)
   {
     case "filter.added":
     case "filter.removed":
     case "filter.disabled":
       // Only request blocking/whitelisting filters have
       // an effect on the webRequest handler behavior.
       if (!(arg instanceof RegExpFilter))
         break;
     case "subscription.added":
     case "subscription.removed":
     case "subscription.disabled":
     case "subscription.updated":
     case "load":
       ext.webRequest.handlerBehaviorChanged();
       break;
   }
 });
 
-function onBeforeRequestAsync(url, type, page, filter)
+function onBeforeRequestAsync(page, url, type, docDomain,
+                              thirdParty, key, specificOnly,
+                              filter)
 {
   if (filter)
     FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
+
+  if (devtools)
+    devtools.logRequest(
+      page, url, type, docDomain,
+      thirdParty, key, specificOnly,
+      filter
+    );
 }
 
 function onBeforeRequest(url, type, page, frame)
 {
-  if (isFrameWhitelisted(page, frame))
+  if (checkWhitelisted(page, frame))
     return true;
 
+  var urlString = stringifyURL(url);
   var docDomain = extractHostFromFrame(frame);
+  var thirdParty = isThirdParty(url, docDomain);
   var key = getKey(page, frame);
-  var specificOnly = isFrameWhitelisted(page, frame,
-                                        RegExpFilter.typeMap.GENERICBLOCK);
-  var filter = defaultMatcher.matchesAny(
-    stringifyURL(url),
-    RegExpFilter.typeMap[type], docDomain,
-    isThirdParty(url, docDomain),
-    key,
-    specificOnly
+
+  var specificOnly = !!checkWhitelisted(
+    page, frame, RegExpFilter.typeMap.GENERICBLOCK
   );
 
-  setTimeout(onBeforeRequestAsync, 0, url, type, page, filter);
+  var filter = defaultMatcher.matchesAny(
+    urlString, RegExpFilter.typeMap[type],
+    docDomain, thirdParty, key, specificOnly
+  );
+
+  setTimeout(onBeforeRequestAsync, 0, page, urlString,
+                                      type, docDomain,
+                                      thirdParty, key,
+                                      specificOnly, filter);
 
   return !(filter instanceof BlockingFilter);
 }
 
 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
 
 if (platform == "chromium")
 {
   function onHeadersReceived(details)
   {
@@ skipping 13 matching lines @@
 
   chrome.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }