diff options
| author | lfg <lfg@chromium.org> | 2015-07-15 09:00:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 16:00:46 +0000 |
| commit | 573e8be6d639b7066a270ae99d02e829e10b90dd (patch) | |
| tree | 4e6994350d156a2e0a7aabbd29740a8892a662d0 /content/browser/frame_host/render_frame_host_manager.h | |
| parent | 59511b2fcee7465e5d23565d0387f980119c08e8 (diff) | |
| download | chromium_src-573e8be6d639b7066a270ae99d02e829e10b90dd.zip chromium_src-573e8be6d639b7066a270ae99d02e829e10b90dd.tar.gz chromium_src-573e8be6d639b7066a270ae99d02e829e10b90dd.tar.bz2 | |
Fix race when reloading original URL.
Fixes an issue where the browser's last committed entry and the renderer can become out of sync when reloading the original requested URL, which causes the browser to kill the renderer process.
BUG=491861
TBR=jam@chromium.org for chromium.fyi.json
Review URL: https://codereview.chromium.org/1189413005
Cr-Commit-Position: refs/heads/master@{#338864}
Diffstat (limited to 'content/browser/frame_host/render_frame_host_manager.h')
| -rw-r--r-- | content/browser/frame_host/render_frame_host_manager.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h index 9386e70..e3cfb0f 100644 --- a/content/browser/frame_host/render_frame_host_manager.h +++ b/content/browser/frame_host/render_frame_host_manager.h @@ -292,8 +292,11 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { // Called when we want to instruct the renderer to navigate to the given // navigation entry. It may create a new RenderFrameHost or re-use an existing // one. The RenderFrameHost to navigate will be returned. Returns NULL if one - // could not be created. - RenderFrameHostImpl* Navigate(const FrameNavigationEntry& frame_entry, + // could not be created. |dest_url| takes precedence over the |frame_entry|'s + // url (this is necessary because ReloadOriginalRequest navigates to a + // different URL than the last committed entry, without modifying it). + RenderFrameHostImpl* Navigate(const GURL& dest_url, + const FrameNavigationEntry& frame_entry, const NavigationEntryImpl& entry); // Instructs the various live views to stop. Called when the user directed the |