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

chrome/ext/background.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 396 matching lines @@
           for (var frameId in frames)
           {
             if (frames[frameId].url == this._url)
             {
               frame = frames[frameId];
               break;
             }
           }
         }
 
-        if (frame && frame.parent != -1)
-          return new Frame({id: frame.parent, tab: this._tab});
-        else

[Felix Dahlke, 2014/01/20 00:02:15]

No else before return, as described in the Mozilla Coding Style.

+        if (!frame || frame.parent == -1)
           return null;
+
+        return new Frame({id: frame.parent, tab: this._tab});
       }
     }
   };
 
 
   /* Web request blocking */
 
   chrome.webRequest.onBeforeRequest.addListener(function(details)
   {
     // the high-level code isn't interested in requests that aren't related
@@ skipping 76 matching lines @@
     onCompleted: new CompletedTabEventTarget(),
     onActivated: new ActivatedTabEventTarget(),
     onRemoved: new RemovedTabEventTarget()
   };
 
   ext.webRequest = {
     onBeforeRequest: new SimpleEventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 
-  var contextMenu = [];
+  var contextMenuItems = [];
+  var isContextMenuHidden = true;
   ext.contextMenus = {
     addMenuItem: function(title, contexts, onclick)
     {
-      contextMenu.push({
+      contextMenuItems.push({
         title: title,
         contexts: contexts,
         onclick: function(info, tab)
         {
           onclick(info.srcUrl, new Tab(tab));
         }
       });
+      this.showMenuItems();
     },
     removeMenuItems: function()
     {
-      contextMenu = [];
-    },
-    showMenu: function()
-    {
+      contextMenuItems = [];
+      this.hideMenuItems();
+    },
+    showMenuItems: function()
+    {
+      if (!isContextMenuHidden)
+        return;
+
       chrome.contextMenus.removeAll(function()
       {
-        for (var i = 0; i < contextMenu.length; i++)
-        {
-          var item = contextMenu[i];
+        for (var i = 0; i < contextMenuItems.length; i++)
+        {
+          var item = contextMenuItems[i];
           chrome.contextMenus.create({
             title: item.title,
             contexts: item.contexts,
             onclick: item.onclick
           });
         }
       });
-    },
-    hideMenu: function()
-    {
+      isContextMenuHidden = false;
+    },
+    hideMenuItems: function()
+    {
+      if (isContextMenuHidden)
+        return;
+
       chrome.contextMenus.removeAll();
+      isContextMenuHidden = true;
     }
   };
 
   ext.onMessage = new BackgroundMessageEventTarget();
 })();