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
  * 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()
 {
   /* 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 28 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)
-      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 34 matching lines @@
 
       return array;
     },
     deserialize: function(spec, memo)
     {
       switch (spec.type)
       {
         case "value":
           return spec.value;
         case "object":
-        case "function":
-          return this.getObject(spec.objectId, spec.type);
+          return this.getObject(spec.objectId);
         case "array":
           if (!memo)
             memo = {specs: [], arrays: []};
 
           var idx = memo.specs.indexOf(spec);
           if (idx != -1)
             return memo.arrays[idx];
 
           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({
+        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
+        enumerable: enumerable,
+        configurable: true
       };
     },
-    createObject: function(objectId)
-    {
-      var objectInfo = this.send({
-        type: "inspectObject",
-        objectId: objectId
-      });
-
-      var prototype;
-      if (objectInfo.prototypeId != null)
-        prototype = this.getObject(objectInfo.prototypeId);
-      else
-        prototype = Object.prototype;
-
-      var properties = {};
-      for (var property in objectInfo.properties)
-        properties[property] = this.createProperty(
-          objectId, property,
-          objectInfo.properties[property].enumerable
-        );
-
-      return Object.create(prototype, properties);
-    },
     createFunction: function(objectId)
     {
-      var objectInfo = this.send({
-        type: "inspectObject",
-        objectId: objectId
-      });
-
       var proxy = this;
-      var func = function()
+      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)
             )
           })
         );
       };
-
-      var builtin = Object.getOwnPropertyNames(func);
+    },
+    getObject: function(objectId) {
+      var objectInfo = this.send({
+        type: "inspectObject",
+        objectId: objectId
+      });
+
+      var obj = this.objects[objectId];
+      if (obj)
+        Object.getOwnPropertyNames(obj).forEach(function(prop) { delete obj[prop]; });
+      else
+      {
+        if (objectInfo.isFunction)
+          obj = this.createFunction(objectId);
+        else
+          obj = {};
+
+        this.objects[objectId] = obj;
+      }
+
+      var ignored = [];
+      if ("prototypeOf" in objectInfo)
+      {
+        var prototype = window[objectInfo.prototypeOf].prototype;
+
+        ignored = Object.getOwnPropertyNames(prototype);
+        ignored.splice(ignored.indexOf("constructor"), 1);
+
+        obj.__proto__ = prototype;
+      }
+      else
+      {
+        if (objectInfo.isFunction)
+          ignored = Object.getOwnPropertyNames(function() {});
+        else
+          ignored = [];
+
+        if ("prototypeId" in objectInfo)
+          obj.__proto__ = this.getObject(objectInfo.prototypeId);
+        else
+          obj.__proto__ = null;
+      }
+
       for (var property in objectInfo.properties)
-        if (builtin.indexOf(property) == -1)
-          Object.defineProperty(func, property, this.createProperty(
+        if (ignored.indexOf(property) == -1)
+          Object.defineProperty(obj, property, this.createProperty(
             objectId, property,
             objectInfo.properties[property].enumerable
           ));
 
-      func.prototype = this.getProperty(objectId, "prototype");
-      return func;
-    },
-    getObject: function(objectId, type)
-    {
-      var obj = this.objects[objectId];
-
-      if (!obj)
-      {
-        if (type == "function")
-          obj = this.createFunction(objectId);
-        else
-          obj = this.createObject(objectId);
-
-        this.objects[objectId] = obj;
-      }
+      if (objectInfo.isFunction)
+        obj.prototype = this.getProperty(objectId, "prototype");
 
       return obj;
     }
   };
 
 
   /* Web request blocking */
 
   document.addEventListener("beforeload", function(event)
   {
@@ skipping 22 matching lines @@
           break;
         }
       default:
         type = "other";
     }
 
     if (!safari.self.tab.canLoad(event, {type: "webRequest", payload: {url: event.url, type: type}}))
       event.preventDefault();
   }, true);
 
+
   /* API */
 
   ext.backgroundPage = {
     _eventTarget: safari.self,
     _messageDispatcher: safari.self.tab,
 
     sendMessage: sendMessage,
     getWindow: function() { return proxy.getObject(0); }
   };
 
   ext.onMessage = new MessageEventTarget(safari.self);
 })();