content/browser/frame_host/render_frame_host_manager.cc - Issue 475783002: PlzNavigate: add cancel navigation logic for uncommitted requests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 475783002: PlzNavigate: add cancel navigation logic for uncommitted requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Ignores commits of stale navigation requests Created 6 years, 4 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

« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5e0872c30b7469b44c38154fefdba2631c72a852..679ad4144dc0f9ec94b8ce9706781a4f070da65a 100644

--- a/content/browser/frame_host/render_frame_host_manager.cc

+++ b/content/browser/frame_host/render_frame_host_manager.cc

@@ -581,6 +581,14 @@ void RenderFrameHostManager::CommitNavigation(

const NavigationBeforeCommitInfo& info) {

CHECK(CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableBrowserSideNavigation));

+ DCHECK(navigation_request_.get());

+ // Ignores navigation commits if the request ID doesn't match the current

+ // active request.

+ if (navigation_request_->navigation_request_id() !=

+ info.navigation_request_id) {

+ return;

+ }

// Pick the right RenderFrameHost to commit the navigation.

SiteInstance* current_instance = render_frame_host_->GetSiteInstance();

// TODO(clamy): Replace the default values by the right ones. This may require