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

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

Issue 642813007: Drop CreateChildFrame messages when swapping out. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on Charlie's review. Created 6 years, 2 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/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 7a17f1c1041352996ae4ac2f4ea69487fe4db767..ef410f26efd86b613bb3dd43620247da5e1b2ff6 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -143,8 +143,16 @@ void FrameTree::ForEach(
}
RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
+ int process_id,
int new_routing_id,
const std::string& frame_name) {
+ // A child frame always starts with an initial empty document, which means
+ // it is in the same SiteInstance as the parent frame. Ensure that the process
+ // which requested a child frame to be added is the same as the process of the
+ // parent node.
+ if (parent->current_frame_host()->GetProcess()->GetID() != process_id)
+ return nullptr;
+
scoped_ptr<FrameTreeNode> node(new FrameTreeNode(
this, parent->navigator(), render_frame_delegate_, render_view_delegate_,
render_widget_delegate_, manager_delegate_, frame_name));

Powered by Google App Engine
This is Rietveld 408576698