Added Safari Support

safari/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
@@ skipping 48 matching lines @@
               obj.apply(
                 this.getObject(event.message.contextId),
                 this.deserializeSequence(event.message.args)
               );
           }.bind(this));
         }
 
         return {type: "callback", callbackId: callbackId};
       }
 
-      if (typeof obj == "object")
-      if (obj != null)

[Felix Dahlke, 2013/11/10 01:07:00]

As before, why no logical operators instead of nested ifs?

[Sebastian Noack, 2013/11/10 14:40:09]

Think of it as a more readable alternative way of AND'ing conditions, that won't
fit all on one line.

[Wladimir Palant, 2013/11/12 10:37:02]

As before, this is really bad style. Please don't do that.

-      if (obj.constructor != Date)
-      if (obj.constructor != RegExp)
+      if (typeof obj == "object" &&
+          obj != null &&
+          obj.constructor != Date &&
+          obj.constructor != RegExp)
       {
         if (!memo)
           memo = {specs: [], objects: []};
 
         var idx = memo.objects.indexOf(obj);
         if (idx != -1)
           return memo.specs[idx];
 
         var spec = {};
         memo.specs.push(spec);
@@ skipping 53 matching lines @@
           var array = [];
           memo.specs.push(spec);
           memo.arrays.push(array);
 
           return this.deserializeSequence(spec.items, array, memo);
       }
     },
     getProperty: function(objectId, property)
     {
       return this.deserializeResult(
-        this.send({

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

[Felix Dahlke, 2013/11/12 09:50:24]

This hasn't been addressed.

+        this.send(
+        {
           type: "getProperty",
           objectId: objectId,
           property: property
         })
       );
     },
     createProperty: function(objectId, property, enumerable)
     {
       return {
         get: function()
         {
           return this.getProperty(objectId, property);
         }.bind(this),
         set: function(value)
         {
           this.checkResult(
-            this.send({
+            this.send(
+            {
               type: "setProperty",
               objectId: objectId,
               property: property,
               value: this.serialize(value)
             })
-          )
+          );
         }.bind(this),
         enumerable: enumerable,
         configurable: true
       };
     },
     createFunction: function(objectId)
     {
       var proxy = this;
       return function()
       {
         return proxy.deserializeResult(
-          proxy.send({
+          proxy.send(
+          {
             type: "callFunction",
             functionId: objectId,
             contextId: proxy.objects.indexOf(this),
             args: Array.prototype.map.call(
               arguments,
               proxy.serialize.bind(proxy)
             )
           })
         );
       };
@@ skipping 97 matching lines @@
   ext.backgroundPage = {
     _eventTarget: safari.self,
     _messageDispatcher: safari.self.tab,
 
     sendMessage: sendMessage,
     getWindow: function() { return proxy.getObject(0); }
   };
 
   ext.onMessage = new MessageEventTarget(safari.self);
 })();