Issue 3515 - Adapted polyfill for URL class for consistency

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
@@ skipping 149 matching lines @@
     // toolbar item of the window, is reset to its intial configuration.
     updateToolbarItemForPage(event.target._visiblePage, event.target.browserWindow);
   }, true);
 
 
   /* Pages */
 
   var pages = Object.create(null);
   var pageCounter = 0;
 
-  var Frame = function(url, parent)

[Sebastian Noack, 2016/01/14 17:27:21]

Note that all changes in this file are the result of reverting the changes from
#2172. This workaround isn't necessary anymore as the polyfill lives in an own
file now which is loaded before ext.

-  {
-    this._urlString = url;
-    this._urlObj = null;
-
-    this.parent = parent;
-  }
-  Frame.prototype = {
-    get url()
-    {
-      // On Safari 6 and before, the URL constuctor doesn't exist.
-      // The "urls" module provides a polifill, but it might not
-      // be loaded yet. So we have to lazily parse URLs.
-      if (!this._urlObj)
-      {
-        this._urlObj = new URL(this._urlString);
-        this._urlString = null;
-      }
-
-      return this._urlObj;
-    }
-  };
-
   var Page = function(id, tab, url)
   {
     this._id = id;
     this._tab = tab;
-    this._frames = [new Frame(url, null)];
+    this._frames = [{url: new URL(url), parent: null}];
 
     if (tab.page)
       this._messageProxy = new ext._MessageProxy(tab.page);
     else
       // while the new tab page is shown on Safari 7, the 'page' property
       // of the tab is undefined, and we can't send messages to that page
       this._messageProxy = {
         handleRequest: function() {},
         handleResponse: function() {},
         sendMessage: function() {}
@@ skipping 429 matching lines @@
               // if we can't find the parent frame and its page, fall back to
               // the page most recently loaded in the tab and its top level frame
               if (!page)
               {
                 pageId = lastPageId;
                 page = lastPage;
                 parentFrame = lastPageTopLevelFrame;
               }
 
               frameId = page._frames.length;
-              page._frames.push(new Frame(message.url, parentFrame));
+              page._frames.push({url: new URL(message.url), parent: parentFrame});
             }
             event.message = {pageId: pageId, frameId: frameId};
             break;
           case "webRequest":
             var page = pages[event.message.pageId];
             var frame = page._frames[event.message.frameId];
 
             var results = ext.webRequest.onBeforeRequest._dispatch(
               new URL(event.message.url, frame.url),
               event.message.type, page, frame
@@ skipping 102 matching lines @@
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
 })();