Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(829)

Unified Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 1255103003: Fix race when reloading original URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 9c96338c1698f6b76ce78e711c4a5f8c2d1fd932..2236c99debd08a193a22610b21685900b43957cc 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
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698