Issue 4647,4598 - More eagerly record URL of new frames

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 110 matching lines @@
       frame = frames[frameId] = {};
 
     return frame;
   }
 
   chrome.webNavigation.onBeforeNavigate.addListener(function(details)
   {
     // Capture parent frame here because onCommitted doesn't get this info.
     var frame = createFrame(details.tabId, details.frameId);
     frame.parent = framesOfTabs[details.tabId][details.parentFrameId] || null;
+
+    // Frames are assumed to always have a URL, so for new frames it's better to
+    // record the URL now. Otherwise requests new frames make before their
+    // onCommitted event fires won't be subject to blocking and will cause
+    // exceptions.
+    if (!("url" in frame))
+      frame.url = new URL(details.url);
   });
 
   var eagerlyUpdatedPages = new ext.PageMap();
 
   ext._updatePageFrameStructure = function(frameId, tabId, url, eager)
   {
     if (frameId == 0)
     {
       let page = new Page({id: tabId, url: url});
 
@@ skipping 498 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();