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

chrome/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 12 matching lines @@
   {
     this._id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
     this.browserAction = new BrowserAction(tab.id);
     this.contextMenus = new ContextMenus(this);
   };
   Page.prototype = {
     get url()
     {
       // usually our Page objects are created from Chrome's Tab objects, which

[Wladimir Palant, 2015/02/11 13:45:45]

Nit: A sentence is usually started by a capital letter (here and in the comment
below).

[Sebastian Noack, 2015/02/11 17:07:06]

Note that I just reverted those lines including the comments to as their current
version. So those comments aren't matter of this change anymore. I generally
agree, but it's probably not worth an unrelated change here. ;)

       // provide the url. So we can return the url given in the constructor.
       if (this._url)
         return this._url;
 
       // but sometimes we only have the tab id when we create a Page object.

[Sebastian Noack, 2015/02/11 10:55:51]

All changes below are due to rebase.

       // In that case we get the url from top frame of the tab, recorded by
       // the onBeforeRequest handler.
       var frames = framesOfTabs[this._id];
       if (frames)
       {
         var frame = frames[0];
         if (frame)
           return frame.url;
       }
     },
@@ skipping 263 matching lines @@
 
   chrome.windows.onFocusChanged.addListener(function(windowId)
   {
     if (windowId != chrome.windows.WINDOW_ID_NONE)
       updateContextMenu();
   });
 
 
   /* Web requests */
 
-  var framesOfTabs = {__proto__: null};
+  var framesOfTabs = Object.create(null);
 
   ext.getFrame = function(tabId, frameId)
   {
     return (framesOfTabs[tabId] || {})[frameId];
   };
 
   ext.webRequest = {
     onBeforeRequest: new ext._EventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 
   chrome.tabs.query({}, function(tabs)
   {
     tabs.forEach(function(tab)
     {
       chrome.webNavigation.getAllFrames({tabId: tab.id}, function(details)
       {
         if (details && details.length > 0)
         {
-          var frames = framesOfTabs[tab.id] = {__proto__: null};
+          var frames = framesOfTabs[tab.id] = Object.create(null);
 
           for (var i = 0; i < details.length; i++)
             frames[details[i].frameId] = {url: new URL(details[i].url), parent: null};
 
           for (var i = 0; i < details.length; i++)
           {
             var parentFrameId = details[i].parentFrameId;
 
             if (parentFrameId != -1)
               frames[details[i].frameId].parent = frames[parentFrameId];
@@ skipping 19 matching lines @@
         // assume that the first request belongs to the top frame. Chrome
         // may give the top frame the type "object" instead of "main_frame".
         // https://code.google.com/p/chromium/issues/detail?id=281711
         details.frameId == 0 && !(details.tabId in framesOfTabs)
       );
 
       var frames = null;
       if (!isMainFrame)
         frames = framesOfTabs[details.tabId];
       if (!frames)
-        frames = framesOfTabs[details.tabId] = {__proto__: null};
+        frames = framesOfTabs[details.tabId] = Object.create(null);
 
       var frame = null;
       var url = new URL(details.url);
       if (!isMainFrame)
       {
         // we are looking for the frame that contains the element that
         // is about to load, however if a frame is loading the surrounding
         // frame is indicated by parentFrameId instead of frameId
         var frameId;
         if (requestType == "sub_frame")
@@ skipping 121 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();