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

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

Issue 2368533002: PlzNavigate: reset NavigationRequest on user-initiated navigation commit (Closed)
Patch Set: Created 4 years, 3 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.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 3a1921bb1f4fd708ba265327e41fa1212fc2be64..6ef20666abc8b7bbdb92876ef9e366c3515381dd 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -541,6 +541,8 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
// pending/speculative RenderFrameHost replaces the current one in the
// commit call below.
CommitPending();
+ if (IsBrowserSideNavigationEnabled())
+ frame_tree_node_->ResetNavigationRequest(false);
} else if (render_frame_host == render_frame_host_.get()) {
// A same-process navigation committed while a simultaneous cross-process
// navigation is still ongoing.
@@ -556,6 +558,7 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
if (was_caused_by_user_gesture) {
if (IsBrowserSideNavigationEnabled()) {
CleanUpNavigation();
+ frame_tree_node_->ResetNavigationRequest(false);
} else {
CancelPending();
}

Powered by Google App Engine
This is Rietveld 408576698