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 = Object.create(null);
   var pageCounter = 0;
 
   var Page = function(id, tab, url)
   {
     this._id = id;
     this._tab = tab;
-    this._frames = [{url: url, parent: 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 528 matching lines @@
               // loaded in the same tab. If there is more than one match,
               // the most recent loaded page and frame is preferred.
               for (var curPageId in tab._pages)
               {
                 var curPage = pages[curPageId];
 
                 for (var i = 0; i < curPage._frames.length; i++)
                 {
                   var curFrame = curPage._frames[i];
 
-                  if (curFrame.url == message.referrer)
+                  if (curFrame.url.href == message.referrer)
                   {
                     pageId = curPageId;
                     page = curPage;
                     parentFrame = curFrame;
                   }
 
                   if (i == 0)
                   {
                     lastPageId = curPageId;
                     lastPage = curPage;
                     lastPageTopLevelFrame = curFrame;
                   }
                 }
               }
 
               // 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({url: message.url, parent: 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(
-              event.message.url,
-              event.message.type,
-              page,
-              page._frames[event.message.frameId]
+              new URL(event.message.url, frame.url),
+              event.message.type, page, frame
             );
 
             event.message = (results.indexOf(false) == -1);
             break;
           case "proxy":
             event.message = backgroundPageProxy.handleMessage(event.message);
             break;
           case "request":
             var page = pages[event.message.pageId];
             var sender = {page: page, frame: page._frames[event.message.frameId]};
@@ skipping 37 matching lines @@
 
   ext.showOptions = function(callback)
   {
     var optionsUrl = safari.extension.baseURI + "options.html";
 
     for (var id in pages)
     {
       var page = pages[id];
       var tab = page._tab;
 
-      if (page.url == optionsUrl && tab.browserWindow == safari.application.activeBrowserWindow)
+      if (page.url.href == optionsUrl && tab.browserWindow == safari.application.activeBrowserWindow)
       {
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
 })();