Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1228)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 517813002: Keep a copy of page id in RenderViewHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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
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 c9c7c8ce8593dbfc8462ed7ab5dd9d573e39ae15..fa87cbf3f95e9306d630b9e52b06528e3e479d37 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -569,8 +569,9 @@ void RenderFrameHostImpl::OnDidRedirectProvisionalLoad(
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, page_id, source_url, target_url);
+ this, render_view_host_->page_id_, source_url, target_url);
}
// Called when the renderer navigates. For every frame loaded, we'll get this
@@ -592,6 +593,10 @@ void RenderFrameHostImpl::OnNavigate(const IPC::Message& msg) {
TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnNavigate",
"url", validated_params.url.possibly_invalid_spec());
+ // 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
// navigating already and sent it before hearing the FrameMsg_Stop message.
@@ -925,6 +930,7 @@ void RenderFrameHostImpl::OnUpdateTitle(
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) {
@@ -932,7 +938,7 @@ void RenderFrameHostImpl::OnUpdateTitle(
return;
}
- delegate_->UpdateTitle(this, page_id, title,
+ delegate_->UpdateTitle(this, render_view_host_->page_id_, title,
WebTextDirectionToChromeTextDirection(
title_direction));
}

Powered by Google App Engine
This is Rietveld 408576698