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 dde456aada68e1ffc62fd68431f957120b0f8567..23c965e8b453c67623692f4e3641cc412c00674a 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -552,9 +552,8 @@ |
int32 page_id, |
const GURL& source_url, |
const GURL& target_url) { |
- CHECK_EQ(render_view_host_->page_id_, page_id); |
frame_tree_node_->navigator()->DidRedirectProvisionalLoad( |
- this, render_view_host_->page_id_, source_url, target_url); |
+ this, page_id, source_url, target_url); |
} |
// Called when the renderer navigates. For every frame loaded, we'll get this |
@@ -573,10 +572,6 @@ |
if (!IPC::ParamTraits<FrameHostMsg_DidCommitProvisionalLoad_Params>:: |
Read(&msg, &iter, &validated_params)) |
return; |
- |
- // Update the RVH's current page ID so that future IPCs from the renderer |
- // correspond to the new page. |
- render_view_host_->page_id_ = validated_params.page_id; |
// If we're waiting for a cross-site beforeunload ack from this renderer and |
// we receive a Navigate message from the main frame, then the renderer was |
@@ -890,7 +885,6 @@ |
int32 page_id, |
const base::string16& title, |
blink::WebTextDirection title_direction) { |
- CHECK_EQ(render_view_host_->page_id_, page_id); |
// This message is only sent for top-level frames. TODO(avi): when frame tree |
// mirroring works correctly, add a check here to enforce it. |
if (title.length() > kMaxTitleChars) { |
@@ -898,7 +892,7 @@ |
return; |
} |
- delegate_->UpdateTitle(this, render_view_host_->page_id_, title, |
+ delegate_->UpdateTitle(this, page_id, title, |
WebTextDirectionToChromeTextDirection( |
title_direction)); |
} |