Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari

lib/stats.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
@@ skipping 20 matching lines @@
  * @param  {String} key   field key
  * @param  {Number} tabId tab ID (leave undefined for total stats)
  * @return {Number}       field value
  */
 let getStats = exports.getStats = function getStats(key, tab)
 {
   if (!tab)
     return (key in Prefs.stats_total ? Prefs.stats_total[key] : 0);
 
   let tabStats = statsPerTab.get(tab);
-  return tabStats && tabStats.blocked || 0;

[Felix Dahlke, 2014/01/18 13:39:19]

We're typically not using and/or as branching operators in JavaScript, that's
what ?: is for.

[Sebastian Noack, 2014/01/19 10:19:40]

Done.

+  return tabStats ? tabStats.blocked : 0;
 };
 
 FilterNotifier.addListener(function(action, item, newValue, oldValue, tab)
 {
   if (action != "filter.hitCount" || !tab)
     return;
 
   let blocked = item instanceof BlockingFilter;
 
   // Increment counts
@@ skipping 61 matching lines @@
       {
         badge = {
           color: badgeColor,
           number: tabStats.blocked
         };
       }
     }
     tab.browserAction.setBadge(badge);
   });
 });