Added ad counting functionality

webrequest.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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;
+
 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*/*", "https://*/*"]}, ["blocking"]);
 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http://*/*", "https://*/*"]}, ["responseHeaders"]);
 chrome.tabs.onRemoved.addListener(forgetTab);
 
 var onFilterChangeTimeout = null;
 function onFilterChange()
 {
   onFilterChangeTimeout = null;
   chrome.webRequest.handlerBehaviorChanged();
 }
 
 var importantNotifications = {
   'filter.added': true,
   'filter.removed': true,
   'filter.disabled': true,
   'subscription.added': true,
   'subscription.removed': true,
   'subscription.disabled': true,
   'subscription.updated': true,
   'load': true
 };
 
-require("filterNotifier").FilterNotifier.addListener(function(action)
+FilterNotifier.addListener(function(action)
 {
   if (action in importantNotifications)
   {
     // Execute delayed to prevent multiple executions in a quick succession
     if (onFilterChangeTimeout != null)
       window.clearTimeout(onFilterChangeTimeout);
     onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
   }
 });
 
@@ skipping 12 matching lines @@
     return {};
 
   // Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
   if (type == "sub_frame")
     type = "SUBDOCUMENT";
   else
     type = type.toUpperCase();
 
   var frame = (type != "SUBDOCUMENT" ? details.frameId : details.parentFrameId);
   var filter = checkRequest(type, details.tabId, details.url, frame);
+  FilterNotifier.triggerListeners("document.stats", filter, details.tabId);

[Wladimir Palant, 2013/09/18 09:44:41]

The usual notification is "filter.hitCount". This one isn't being sent out
automatically in Chrome because we don't actually count hits, no reason to add a
new notification however.

[Thomas Greiner, 2013/09/19 09:42:29]

I thought about it before but the arguments differ between this and the Firefox
version.

Firefox: name, filter, new value, old value
Chrome: name, filter, tab ID

[Wladimir Palant, 2013/09/19 10:56:22]

I guess we can introduce an additional application-specific parameter. So you
would call here:

FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, details.tabId);

And once we actually start counting hits in Chrome we'll call
FilterStorage.increaseHitCount() here and add "context" as an additional
parameter for that call.

   if (filter instanceof BlockingFilter)
     return {cancel: true};
   else
     return {};
 }
 
 function onHeadersReceived(details)
 {
   if (details.tabId == -1)
     return;
@@ skipping 107 matching lines @@
     parent = frameData.parent;
     parentData = getFrameData(tabId, parent);
 
     var frameUrl = frameData.url;
     var parentUrl = (parentData ? parentData.url : frameUrl);
     if ("keyException" in frameData || isWhitelisted(frameUrl, parentUrl, type))
       return true;
   }
   return false;
 }