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

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

Issue 117603002: Always create FrameTreeNodes and RenderFrameHosts for every frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix prerendering. Created 6 years, 11 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 cb0f453656dddd326ae197a0d0e66f5911573bdd..f26c46c02360a0eda43722ffe1a1d417709e857a 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -110,9 +110,10 @@ RenderFrameHostImpl* FrameTree::AddFrame(int frame_routing_id,
scoped_ptr<FrameTreeNode> node(new FrameTreeNode(
this, parent->navigator(), render_frame_delegate_, render_view_delegate_,
render_widget_delegate_, manager_delegate_, frame_id, frame_name));
- RenderFrameHostImpl* render_frame = node->current_frame_host();
+ FrameTreeNode* node_ptr = node.get();
+ // AddChild is what creates the RenderFrameHost.
parent->AddChild(node.Pass(), frame_routing_id);
- return render_frame;
+ return node_ptr->current_frame_host();
}
void FrameTree::RemoveFrame(RenderFrameHostImpl* render_frame_host,
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer.cc ('k') | content/browser/frame_host/frame_tree_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698