Issue 1801 - Use URL objects to process URLs in the background page

safari/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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()
 {
   /* Pages */
 
-  var pages = {__proto__: null};
+  var pages = Object.create(null);
   var pageCounter = 0;
 
   var Page = function(id, tab, url)
   {
     this._id = id;
     this._tab = tab;
     this._frames = [{url: new URL(url), parent: null}];
 
     if (tab.page)
       this._messageProxy = new ext._MessageProxy(tab.page);
@@ skipping 461 matching lines @@
           var obj = objects[message.objectId];
           var objectInfo = {properties: {}, isFunction: typeof obj == "function"};
 
           Object.getOwnPropertyNames(obj).forEach(function(prop)
           {
             objectInfo.properties[prop] = {
               enumerable: Object.prototype.propertyIsEnumerable.call(obj, prop)
             };
           });
 
-          if (obj.__proto__)
-            objectInfo.prototypeId = this.registerObject(obj.__proto__, objects);
+          var proto = Object.getPrototypeOf(obj);
+          if (proto)
+            objectInfo.prototypeId = this.registerObject(proto, objects);
 
           if (obj == Object.prototype)
             objectInfo.prototypeOf = "Object";
           if (obj == Function.prototype)
             objectInfo.prototypeOf = "Function";
 
           return objectInfo;
       }
     }
   };
@@ skipping 14 matching lines @@
 
             var pageId;
             var frameId;
 
             if (message.isTopLevel)
             {
               pageId = ++pageCounter;
               frameId = 0;
 
               if (!('_pages' in tab))
-                tab._pages = {__proto__: null};
+                tab._pages = Object.create(null);
 
               var page = new Page(pageId, tab, message.url);
               pages[pageId] = tab._pages[pageId] = page;
 
               // when a new page is shown, forget the previous page associated
               // with its tab, and reset the toolbar item if necessary.
               // Note that it wouldn't be sufficient to do that when the old
               // page is unloading, because Safari dispatches window.onunload
               // only when reloading the page or following links, but not when
               // you enter a new URL in the address bar.
@@ skipping 123 matching lines @@
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
 })();