Fixed properties defined on prototype in Safari background page proxy

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()
 {
+  // the safari object is missing in frames created from javascript: URLs.
+  // So we have to fallback to the safari object from the parent frame.
+  if (!("safari" in window))
+    window.safari = window.parent.safari;
+
+
   /* Intialization */
 
   var beforeLoadEvent = document.createEvent("Event");
   beforeLoadEvent.initEvent("beforeload");
 
   var isTopLevel = window == window.top;
   var isPrerendered = document.visibilityState == "prerender";
 
   var documentInfo = safari.self.tab.canLoad(
     beforeLoadEvent,
@@ skipping 53 matching lines @@
         category: "webRequest",
         url: event.url,
         type: type,
         pageId: documentInfo.pageId,
         frameId: documentInfo.frameId
       }
     ))
     {
       event.preventDefault();
 
-      // Safari doesn't dispatch an "error" or "load" event when preventing an
-      // element from loading by cancelling the "beforeload" event. So we have
-      // to dispatch it manually. Otherwise element collapsing wouldn't work.
-      var evt = document.createEvent("Event");
-      evt.initEvent(type == "sub_frame" ? "load" : "error");
-      event.target.dispatchEvent(evt);
+      // Safari doesn't dispatch an "error" event when preventing an element
+      // from loading by cancelling the "beforeload" event. So we have to
+      // dispatch it manually. Otherwise element collapsing wouldn't work.
+      if (type != "sub_frame")
+      {
+        var evt = document.createEvent("Event");
+        evt.initEvent(type == "error");
+        event.target.dispatchEvent(evt);
+      }
     }
   }, true);
 
 
   /* Context menus */
 
   document.addEventListener("contextmenu", function(event)
   {
     var element = event.srcElement;
     safari.self.tab.setContextMenuEventUserInfo(event, {
@@ skipping 22 matching lines @@
       if (!result.succeed)
         throw result.error;
     },
     deserializeResult: function(result)
     {
       this.checkResult(result);
       return this.deserialize(result.result);
     },
     serialize: function(obj, memo)
     {
-      if ((typeof obj == "object" || typeof obj == "function") && obj != null)
+      if (typeof obj == "object" && obj != null || typeof obj == "function")
       {
         if ("__proxyObjectId" in obj)
           return {type: "hosted", objectId: obj.__proxyObjectId};
 
         if (typeof obj == "function")
         {
           var callbackId;
           if ("__proxyCallbackId" in obj)
             callbackId = obj.__proxyCallbackId;
           else
@@ skipping 152 matching lines @@
       {
         if (objectInfo.isFunction)
           obj = this.createFunction(objectId);
         else
           obj = {};
 
         this.objects[objectId] = obj;
         Object.defineProperty(obj, "__proxyObjectId", {value: objectId});
       }
 
-      var ignored = [];
+      var excluded = [];
+      var included = [];
       if ("prototypeOf" in objectInfo)
       {
         var prototype = window[objectInfo.prototypeOf].prototype;
 
-        ignored = Object.getOwnPropertyNames(prototype);
-        ignored.splice(ignored.indexOf("constructor"), 1);
+        excluded = Object.getOwnPropertyNames(prototype);
+        included = ["constructor"];
 
         obj.__proto__ = prototype;
       }
       else
       {
         if (objectInfo.isFunction)
-          ignored = Object.getOwnPropertyNames(function() {});
-        else
-          ignored = [];
+        {
+          excluded = Object.getOwnPropertyNames(function() {});
+          included = ["prototype"];
+        }
 
         if ("prototypeId" in objectInfo)
           obj.__proto__ = this.getObject(objectInfo.prototypeId);
         else
           obj.__proto__ = null;
       }
 
       for (var property in objectInfo.properties)
       {
-        if (ignored.indexOf(property) == -1)
+        if (excluded.indexOf(property) == -1 || included.indexOf(property) != -1)
         {
           var desc = Object.getOwnPropertyDescriptor(obj, property);
 
           if (!desc || desc.configurable)
           {
             Object.defineProperty(obj, property, this.createProperty(
               property, objectInfo.properties[property].enumerable
             ));
           }
           else if (desc.writable)
@@ skipping 39 matching lines @@
             messageProxy.handleResponse(event.message);
             break;
           case "proxyCallback":
             backgroundPageProxy.handleCallback(event.message);
             break;
         }
       }
     }
   });
 })();