content/browser/frame_host/navigator_impl.cc - Issue 606113005: Move RenderViewHost swap out state to RenderFrameHost.

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 606113005: Move RenderViewHost swap out state to RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix review suggestions Created 6 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

« no previous file with comments | « content/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | 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 fc0bdebf30b5b0591c1a7a6ac8987bd9c94db95f..11b322e492b6d1874666c6ea93b13ac912cd268b 100644

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

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

@@ -551,9 +551,10 @@ void NavigatorImpl::RequestOpenURL(

SiteInstance* current_site_instance =

GetRenderManager(render_frame_host)->current_frame_host()->

GetSiteInstance();

- // If this came from a swapped out RenderViewHost, we only allow the request

+ // If this came from a swapped out RenderFrameHost, we only allow the request

// if we are still in the same BrowsingInstance.

- if (render_frame_host->render_view_host()->IsSwappedOut() &&

+ // TODO(creis): Move this to RenderFrameProxyHost::OpenURL.

+ if (render_frame_host->is_swapped_out() &&

!render_frame_host->GetSiteInstance()->IsRelatedSiteInstance(

current_site_instance)) {

return;