content/browser/frame_host/render_frame_host_impl.cc - Issue 1151973005: Bring RFH/RVH unit tests closer to reality of how RF/RV are initialized

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_impl.cc

Issue 1151973005: Bring RFH/RVH unit tests closer to reality of how RF/RV are initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix IsRenderFrameLive to be independent of RenderViewHost. Created 5 years, 7 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/frame_tree_unittest.cc ('K') | « content/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc » ('j') | content/browser/web_contents/web_contents_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_impl.cc

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

index 6899ac9ef8b222ab1101a6a4198d4090762d2fe8..c75a9ce2610790559162dfc12f51b42535946530 100644

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

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

@@ -645,12 +645,7 @@ bool RenderFrameHostImpl::CreateRenderFrame(int parent_routing_id,

}

bool RenderFrameHostImpl::IsRenderFrameLive() {

- // RenderFrames are created for main frames at the same time as RenderViews,

- // so we rely on IsRenderViewLive. For subframes, we keep track of each

- // RenderFrame individually with render_frame_created_.

- bool is_live = !GetParent() ?

- render_view_host_->IsRenderViewLive() :

- GetProcess()->HasConnection() && render_frame_created_;

+ bool is_live = GetProcess()->HasConnection() && render_frame_created_;

// Sanity check: the RenderView should always be live if the RenderFrame is.

DCHECK(!is_live || render_view_host_->IsRenderViewLive());