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

safari/ext/content.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/>.
  */
 
 (function()
 {
   if (window == window.top)
     safari.self.tab.dispatchMessage("loading");
 
 
+  /* Events */
+
+  var ContentMessageEventTarget = function()
+  {
+    MessageEventTarget.call(this, safari.self);
+  };
+  ContentMessageEventTarget.prototype = {
+    __proto__: MessageEventTarget.prototype,
+    _getResponseDispatcher: function(event)
+    {
+      return event.target.tab;
+    },
+    _getSenderDetails: function(event)
+    {
+      return {};
+    }
+  };
+
+
   /* Background page proxy */
   var proxy = {
     objects: [],
     callbacks: [],
 
     send: function(message)
     {
       var evt = document.createEvent("Event");
       evt.initEvent("beforeload");
       return safari.self.tab.canLoad(evt, {type: "proxy", payload: message});
@@ skipping 249 matching lines @@
       case "link":
         if (/\bstylesheet\b/i.test(event.target.rel))
         {
           type = "stylesheet";
           break;
         }
       default:
         type = "other";
     }
 
-    if (!safari.self.tab.canLoad(event, {type: "webRequest", payload: {url: event.url, type: type}}))
+    if (!safari.self.tab.canLoad(event, {

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

{ should go on its own line

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

Done.

+      type: "webRequest",
+      payload: {
+        url: event.url,
+        type: type,
+        documentUrl: document.location.href,
+        isTopLevel: window == window.top
+      }
+    }))
       event.preventDefault();
   }, true);
 
 
   /* API */
 
   ext.backgroundPage = {
-    _eventTarget: safari.self,
-    _messageDispatcher: safari.self.tab,
-
-    sendMessage: sendMessage,
-    getWindow: function() { return proxy.getObject(0); }
+    sendMessage: function(message, responseCallback) {

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

{ should go on its own line

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

Done.

+      _sendMessage(
+        message, responseCallback,
+        safari.self.tab, safari.self,
+        {
+          documentUrl: document.location.href,
+          isTopLevel: window == window.top
+        }
+      );
+    },
+    getWindow: function()
+    {
+      return proxy.getObject(0);
+    }
   };
 
-  ext.onMessage = new MessageEventTarget(safari.self);
+  ext.onMessage = new ContentMessageEventTarget();
 })();