Issue 4386 - Update frame URL after redirection

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 129 matching lines @@
     var frames = framesOfTabs[details.tabId];
     if (!frames)
       frames = framesOfTabs[details.tabId] = Object.create(null);
 
     frames[details.frameId] = {
       parent: frames[details.parentFrameId] || null,
       url: new URL(details.url)
     };
   });
 
+  chrome.webNavigation.onCommitted.addListener(function(details)
+  {

[kzar, 2016/09/01 13:42:07]

(We could also check that details.transitionQualifiers is ["server_redirect"]
here before assigning the URL but I don't know if it's worth it.)

+    // onBeforeNavigate is fired before redirections take place, so we must
+    // ensure the frame's URL is correct here too. (See #4386)
+    var frames = framesOfTabs[details.tabId];
+    if (frames && details.frameId in frames)
+      frames[details.frameId].url = new URL(details.url);
+  });
+
   function forgetTab(tabId)
   {
     ext.pages.onRemoved._dispatch(tabId);
 
     ext._removeFromAllPageMaps(tabId);
     delete framesOfTabs[tabId];
   }
 
   chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId)
   {
@@ skipping 462 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();