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

safari/ext/common.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 41 matching lines @@
           this._wrappedListeners[idx],
           this._capture
         );
 
         this._listeners.splice(idx, 1);
         this._wrappedListeners.splice(idx, 1);
       }
     }
   };
 
-
   MessageEventTarget = function(target)
   {
     WrappedEventTarget.call(this, target, "message", false);
   };
   MessageEventTarget.prototype = {
     __proto__: WrappedEventTarget.prototype,
     _wrapListener: function(listener)
     {
       return function(event)
       {
-        if (event.name.indexOf("request-") != 0)
-          return;
-
-        var sender = {};
-        var dispatcher;
-
-        if ("SafariBrowserTab" in window && event.target instanceof SafariBrowserTab)
-        {
-          dispatcher = event.target.page;
-          sender.tab = new Tab(event.target);
-        }
-        else
-        {
-          dispatcher = event.target.tab;
-          sender.tab = null;
-        }
-
-        listener(event.message, sender, function(message)
-        {
-          dispatcher.dispatchMessage("response-" + event.name.substr(8), message);
-        });
-      };
+        if (event.name == "request")
+          listener(event.message.payload, this._getSenderDetails(event), function(message)
+          {
+            this._getResponseDispatcher(event).dispatchMessage("response", {

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

{ should go on its own line

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

Done.

+              requestId: event.message.requestId,
+              payload: message
+            });
+          }.bind(this));
+      }.bind(this);
     }
   };
 
 
   /* Message passing */
 
   var requestCounter = 0;
 
-  sendMessage = function(message, responseCallback)
+  _sendMessage = function(message, responseCallback, messageDispatcher, responseEventTarget, extra)
   {
     var requestId = ++requestCounter;
 
     if (responseCallback)
     {
-      var eventTarget = this._eventTarget;
       var responseListener = function(event)
       {
-        if (event.name == "response-" + requestId)
+        if (event.name == "response" && event.message.requestId == requestId)
         {
-          eventTarget.removeEventListener("message", responseListener, false);
-          responseCallback(event.message);
+          responseEventTarget.removeEventListener("message", responseListener, false);
+          responseCallback(event.message.payload);
         }
       };
-      eventTarget.addEventListener("message", responseListener, false);
+      responseEventTarget.addEventListener("message", responseListener, false);
     }
 
-    this._messageDispatcher.dispatchMessage("request-" + requestId, message);
+    var rawMessage = {requestId: requestId, payload: message};
+    for (var k in extra)
+      rawMessage[k] = extra[k];
+    messageDispatcher.dispatchMessage("request", rawMessage);
   };
 
 
   /* I18n */
 
   var I18n = function()
   {
     this._localeCandidates = this._getLocaleCandidates();
     this._uiLocale = this._localeCandidates[0];
   };
@@ skipping 88 matching lines @@
   /* API */
 
   ext = {
     getURL: function(path)
     {
       return safari.extension.baseURI + path;
     },
     i18n: new I18n()
   };
 })();