content/browser/frame_host/render_frame_host_manager.cc - Issue 172063002: Unify frame IDs with RenderFrameHost routing IDs.

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 172063002: Unify frame IDs with RenderFrameHost routing IDs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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 c871e0430c7229a4232c80fb27728e24a491857a..a9d3d568789f4d72c7eef7e3a9aea69d40d30624 100644

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

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

@@ -327,7 +327,10 @@ void RenderFrameHostManager::SwappedOutFrame(

}

// Sanity check that this is for the correct frame.

- DCHECK_EQ(frame_tree_node_->frame_id(), pending_nav_params_->frame_id);

+ DCHECK_EQ(frame_tree_node_->current_frame_host()->GetRoutingID(),

+ pending_nav_params_->frame_id);

+ DCHECK_EQ(frame_tree_node_->current_frame_host()->GetProcess()->GetID(),

+ pending_nav_params_->global_request_id.child_id);

// Now that the unload handler has run, we need to either initiate the

// pending transfer (if there is one) or resume the paused response (if not).