| 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 92818c874b9910d30e23a519e590770e6473c8e2..8ec5c0e867316df8ce6035cf1825c4d0a5832998 100644
|
| --- a/content/browser/frame_host/frame_tree.cc
|
| +++ b/content/browser/frame_host/frame_tree.cc
|
| @@ -55,8 +55,7 @@ FrameTree::FrameTree(Navigator* navigator,
|
| render_widget_delegate,
|
| manager_delegate,
|
| FrameTreeNode::kInvalidFrameId,
|
| - std::string(),
|
| - scoped_ptr<RenderFrameHostImpl>())) {
|
| + std::string())) {
|
| }
|
|
|
| FrameTree::~FrameTree() {
|
| @@ -166,16 +165,17 @@ scoped_ptr<FrameTreeNode> FrameTree::CreateNode(
|
| int render_frame_host_id,
|
| Navigator* navigator,
|
| RenderProcessHost* render_process_host) {
|
| + scoped_ptr<FrameTreeNode> frame_tree_node(new FrameTreeNode(navigator,
|
| + render_view_delegate_, render_widget_delegate_, manager_delegate_,
|
| + frame_id, frame_name));
|
| +
|
| scoped_ptr<RenderFrameHostImpl> render_frame_host(
|
| RenderFrameHostFactory::Create(
|
| root_->render_frame_host()->render_view_host(),
|
| - this,
|
| - render_frame_host_id,
|
| - false));
|
| + this, frame_tree_node.get(), render_frame_host_id, false));
|
|
|
| - return make_scoped_ptr(new FrameTreeNode(navigator,
|
| - render_view_delegate_, render_widget_delegate_, manager_delegate_,
|
| - frame_id, frame_name, render_frame_host.Pass()));
|
| + frame_tree_node->set_render_frame_host(render_frame_host.release(), true);
|
| + return frame_tree_node.Pass();
|
| }
|
|
|
| } // namespace content
|
|
|