content/browser/frame_host/navigator_impl.cc - Issue 1009993002: PlzNavigate: destroy the speculative RFH on renderer-initiated navigations

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/navigator_impl.cc

Issue 1009993002: PlzNavigate: destroy the speculative RFH on renderer-initiated navigations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

« content/browser/frame_host/navigation_controller_impl_unittest.cc ('K') | « content/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl.cc

diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc

index 9a211eee80eb1e22f74bb54b107430243be72bcc..c8fd97d6c1874f95de2dd973a97d562fa0e760ea 100644

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

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

@@ -650,8 +650,9 @@ void NavigatorImpl::OnBeginNavigation(

}

// In all other cases the current navigation, if any, is canceled and a new

- // NavigationRequest is created and stored in the map. Actual cancellation

- // happens when the existing request map entry is replaced and destroyed.

+ // NavigationRequest is created and stored in the map.

+ if (ongoing_navigation_request)

+ CancelNavigation(frame_tree_node);

nasko 2015/03/16 18:48:37 nit: Blank line after this new CancelNavigation ca

carlosk 2015/03/17 14:42:59 Don't we need to do the same in NavigatorImpl::Req

clamy 2015/03/18 13:55:55 Done.

scoped_ptr<NavigationRequest> navigation_request =

NavigationRequest::CreateRendererInitiated(

frame_tree_node, common_params, begin_params, body,