content/browser/frame_host/frame_tree.cc - Issue 118443008: Support cross-process navigations in a single subframe 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/frame_tree.cc

Issue 118443008: Support cross-process navigations in a single subframe RenderFrameHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Minor cleanup Created 7 years 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/frame_tree.h ('k') | content/browser/frame_host/navigation_controller_delegate.h » ('j') | content/browser/frame_host/navigation_controller_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/frame_tree.cc

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

index 0dff87bd98430c6dd3924bfe97ba28e8b9b5f5c3..cb0f453656dddd326ae197a0d0e66f5911573bdd 100644

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

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

@@ -196,7 +196,9 @@ RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame(

SiteInstance* site_instance) {

RenderViewHostMap::iterator iter =

render_view_host_map_.find(site_instance->GetId());

- CHECK(iter != render_view_host_map_.end());

+ // TODO(creis): Mirror the frame tree so this check can't fail.

+ if (iter == render_view_host_map_.end())

+ return NULL;

RenderViewHostRefCount rvh_refcount = iter->second;

return rvh_refcount.first;

}