| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/frame_tree_node.h" | 5 #include "content/browser/frame_host/frame_tree_node.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 | 8 |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "content/browser/frame_host/render_frame_host_impl.h" | 10 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 11 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 11 | 12 |
| 12 namespace content { | 13 namespace content { |
| 13 | 14 |
| 14 const int64 FrameTreeNode::kInvalidFrameId = -1; | 15 FrameTreeNode::FrameTreeNode(int64 frame_tree_node_id, |
| 15 | 16 const std::string& name, |
| 16 FrameTreeNode::FrameTreeNode(int64 frame_id, const std::string& name, | 17 RenderViewHostDelegate* render_view_delegate, |
| 17 scoped_ptr<RenderFrameHostImpl> render_frame_host) | 18 RenderWidgetHostDelegate* render_widget_delegate, |
| 18 : frame_id_(frame_id), | 19 RenderViewHostManager::Delegate* manager_delegate) |
| 20 : frame_tree_node_id_(frame_tree_node_id), |
| 19 frame_name_(name), | 21 frame_name_(name), |
| 20 owns_render_frame_host_(true), | 22 render_manager_(render_view_delegate, |
| 21 render_frame_host_(render_frame_host.release()) { | 23 render_widget_delegate, |
| 24 manager_delegate) { |
| 22 } | 25 } |
| 23 | 26 |
| 24 FrameTreeNode::~FrameTreeNode() { | 27 FrameTreeNode::~FrameTreeNode() { |
| 25 if (owns_render_frame_host_) | |
| 26 delete render_frame_host_; | |
| 27 } | 28 } |
| 28 | 29 |
| 29 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { | 30 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { |
| 31 // TODO(creis): Find a sane place to put this. |
| 32 child->render_manager()->Init( |
| 33 render_manager_.current_host()->GetSiteInstance()->GetBrowserContext(), |
| 34 render_manager_.current_host()->GetSiteInstance(), |
| 35 render_manager_.current_host()->GetRoutingID(), |
| 36 MSG_ROUTING_NONE); |
| 30 children_.push_back(child.release()); | 37 children_.push_back(child.release()); |
| 31 } | 38 } |
| 32 | 39 |
| 33 void FrameTreeNode::RemoveChild(int64 child_id) { | 40 void FrameTreeNode::RemoveChild(int64 child_id) { |
| 34 std::vector<FrameTreeNode*>::iterator iter; | 41 std::vector<FrameTreeNode*>::iterator iter; |
| 35 | 42 |
| 36 for (iter = children_.begin(); iter != children_.end(); ++iter) { | 43 for (iter = children_.begin(); iter != children_.end(); ++iter) { |
| 37 if ((*iter)->frame_id() == child_id) | 44 if ((*iter)->frame_tree_node_id() == child_id) |
| 38 break; | 45 break; |
| 39 } | 46 } |
| 40 | 47 |
| 41 if (iter != children_.end()) | 48 if (iter != children_.end()) |
| 42 children_.erase(iter); | 49 children_.erase(iter); |
| 43 } | 50 } |
| 44 | 51 |
| 45 void FrameTreeNode::ResetForMainFrame( | 52 // TODO(creis): Do we need to change the frame ID and URL after a navigation? |
| 53 /*void FrameTreeNode::ResetForMainFrame( |
| 46 RenderFrameHostImpl* new_render_frame_host) { | 54 RenderFrameHostImpl* new_render_frame_host) { |
| 47 DCHECK_EQ(0UL, children_.size()); | 55 DCHECK_EQ(0UL, children_.size()); |
| 48 | 56 |
| 49 owns_render_frame_host_ = false; | 57 owns_render_frame_host_ = false; |
| 50 frame_id_ = kInvalidFrameId; | 58 frame_id_ = kInvalidFrameId; |
| 51 current_url_ = GURL(); | 59 current_url_ = GURL(); |
| 52 children_.clear(); | 60 children_.clear(); |
| 53 | 61 |
| 54 render_frame_host_ = new_render_frame_host; | 62 render_frame_host_ = new_render_frame_host; |
| 55 } | 63 }*/ |
| 56 | 64 |
| 57 } // namespace content | 65 } // namespace content |
| OLD | NEW |