content/browser/frame_host/render_frame_host_manager.cc - Issue 946543003: PlzNavigate: have renderer-initiated navigations be same-process

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 946543003: PlzNavigate: have renderer-initiated navigations be same-process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/navigator_impl_unittest.cc ('K') | « content/browser/frame_host/navigator_impl_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | content/test/test_render_frame_host.h » ('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 0cd3b53b3c42c4eed16da2eba5360ecbc65d8a34..e592d646ab297cb46674ad32ac67dffa1adcbdb4 100644

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

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

@@ -704,9 +704,11 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(

// The appropriate RenderFrameHost to commit the navigation.

RenderFrameHostImpl* navigation_rfh = nullptr;

- // TODO(carlosk): do not swap processes for renderer initiated navigations

- // (see crbug.com/440266).

+ // TODO(carlosk): Remove the renderer-initiated if-check below once OOPIF

clamy 2015/02/23 10:52:34 I would rephrase the comment as: Once there is sup

carlosk 2015/03/04 19:42:40 Done.

+ // provides support for cross-process renderer-initiated navigations. See

+ // crbug.com/440266.

if (current_site_instance == dest_site_instance.get() ||

+ !request.browser_initiated() ||

(!frame_tree_node_->IsMainFrame() &&

!base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kSitePerProcess))) {