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)

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

This would return undefined if frame is falsy. I think something like this would
be simpler:

if (!frame || frame.parent == -1)
  return null;
return new Frame({id: frame.parent, tab: this._tab});

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

Done.

-          if (frame.parent != -1)
-            return new Frame({id: frame.parent, tab: this._tab});
-          else
-            return null;
+        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
     // to a tab and since those can only be handled in Chrome, we ignore
-    // them here instead of in the browser independant high-level code.

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

s/independant/independent/

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

Done.

+    // them here instead of in the browser independent high-level code.
     if (details.tabId == -1)
       return;
 
     var tab = new Tab({id: details.tabId});
     var frames = framesOfTabs.get(tab);
 
     if (!frames)
     {
       frames = [];
       framesOfTabs.set(tab, frames);
@@ skipping 15 matching lines @@
       // since those can only be handled in Chrome, we ignore them here
       // instead of in the browser independent high-level code.
       if (details.type == "main_frame")
         return;
     }
     else
       frameId = details.frameId;
 
     // the high-level code relies on the frame. However in case the frame can't
     // be controlled by the extension or the extension was (re)loaded after the
-    // frame was loaded, the frame is unkown and we have to ignore the request.

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

s/unkown/unknown/

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

Done.

+    // frame was loaded, the frame is unknown and we have to ignore the request.
     if (!(frameId in frames))
       return;
 
     var frame = new Frame({id: frameId, tab: tab});
 
     for (var i = 0; i < ext.webRequest.onBeforeRequest._listeners.length; i++)
     {
       if (ext.webRequest.onBeforeRequest._listeners[i](details.url, details.type, tab, frame) === false)

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

Why not the following?

if (!ext.webRequest.onBeforeRequest._listeners[i](details.url, details.type
     , tab, frame))

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

In order to block the request, the handler should explicitly return false (like
the old way to cancel DOM events). When the function doesn't explicitly return,
the return value is undefined in which case we don't want to block the request.
So I'm using the === operator to make sure that the return value is false (and
not just null or undefined). Also that approach isn't new, it was already used
before this patchset.

         return {cancel: true};
     }
   }, {urls: ["<all_urls>"]}, ["blocking"]);
 
 
   /* API */
 
   ext.windows = {
     getAll: function(callback)
     {
@@ skipping 20 matching lines @@
     onCompleted: new CompletedTabEventTarget(),
     onActivated: new ActivatedTabEventTarget(),
     onRemoved: new RemovedTabEventTarget()
   };
 
   ext.webRequest = {
     onBeforeRequest: new SimpleEventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 
+  var contextMenuItems = [];
+  var isContextMenuHidden = true;
   ext.contextMenus = {
-    create: function(title, contexts, onclick)
-    {
-      chrome.contextMenus.create({
+    addMenuItem: function(title, contexts, onclick)
+    {
+      contextMenuItems.push({
         title: title,
         contexts: contexts,
         onclick: function(info, tab)
         {
           onclick(info.srcUrl, new Tab(tab));
         }
       });
-    },
-    removeAll: function(callback)
-    {
-      chrome.contextMenus.removeAll(callback);
+      this.showMenuItems();
+    },
+    removeMenuItems: function()
+    {
+      contextMenuItems = [];
+      this.hideMenuItems();
+    },
+    showMenuItems: function()
+    {
+      if (!isContextMenuHidden)
+        return;
+
+      chrome.contextMenus.removeAll(function()
+      {
+        for (var i = 0; i < contextMenuItems.length; i++)
+        {
+          var item = contextMenuItems[i];
+          chrome.contextMenus.create({
+            title: item.title,
+            contexts: item.contexts,
+            onclick: item.onclick
+          });
+        }
+      });
+      isContextMenuHidden = false;
+    },
+    hideMenuItems: function()
+    {
+      if (isContextMenuHidden)
+        return;
+
+      chrome.contextMenus.removeAll();
+      isContextMenuHidden = true;
     }
   };
 
   ext.onMessage = new BackgroundMessageEventTarget();
 })();