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/navigator.h" | 10 #include "content/browser/frame_host/navigator.h" |
11 #include "content/browser/frame_host/render_frame_host_impl.h" | 11 #include "content/browser/frame_host/render_frame_host_impl.h" |
12 | 12 |
13 namespace content { | 13 namespace content { |
14 | 14 |
15 const int64 FrameTreeNode::kInvalidFrameId = -1; | 15 const int64 FrameTreeNode::kInvalidFrameId = -1; |
16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; | 16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; |
17 | 17 |
18 FrameTreeNode::FrameTreeNode(Navigator* navigator, | 18 FrameTreeNode::FrameTreeNode(Navigator* navigator, |
19 RenderFrameHostDelegate* render_frame_delegate, | 19 RenderFrameHostDelegate* render_frame_delegate, |
20 RenderViewHostDelegate* render_view_delegate, | 20 RenderViewHostDelegate* render_view_delegate, |
21 RenderWidgetHostDelegate* render_widget_delegate, | 21 RenderWidgetHostDelegate* render_widget_delegate, |
22 RenderFrameHostManager::Delegate* manager_delegate, | 22 RenderFrameHostManager::Delegate* manager_delegate, |
23 int64 frame_id, | 23 int64 frame_id, |
24 const std::string& name, | 24 const std::string& name) |
25 scoped_ptr<RenderFrameHostImpl> render_frame_host) | |
26 : navigator_(navigator), | 25 : navigator_(navigator), |
27 render_manager_(render_frame_delegate, | 26 render_manager_(render_frame_delegate, |
28 render_view_delegate, | 27 render_view_delegate, |
29 render_widget_delegate, | 28 render_widget_delegate, |
30 manager_delegate), | 29 manager_delegate), |
31 frame_tree_node_id_(next_frame_tree_node_id_++), | 30 frame_tree_node_id_(next_frame_tree_node_id_++), |
32 frame_id_(frame_id), | 31 frame_id_(frame_id), |
33 frame_name_(name), | 32 frame_name_(name), |
34 owns_render_frame_host_(true), | 33 owns_render_frame_host_(true), |
35 render_frame_host_(render_frame_host.release()) { | 34 render_frame_host_(NULL) { |
36 } | 35 } |
37 | 36 |
38 FrameTreeNode::~FrameTreeNode() { | 37 FrameTreeNode::~FrameTreeNode() { |
39 if (owns_render_frame_host_) | 38 if (owns_render_frame_host_) |
40 delete render_frame_host_; | 39 delete render_frame_host_; |
41 } | 40 } |
42 | 41 |
43 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { | 42 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { |
44 children_.push_back(child.release()); | 43 children_.push_back(child.release()); |
45 } | 44 } |
(...skipping 18 matching lines...) Expand all Loading... |
64 | 63 |
65 // The children may not have been cleared if a cross-process navigation | 64 // The children may not have been cleared if a cross-process navigation |
66 // commits before the old process cleans everything up. Make sure the child | 65 // commits before the old process cleans everything up. Make sure the child |
67 // nodes get deleted. | 66 // nodes get deleted. |
68 children_.clear(); | 67 children_.clear(); |
69 | 68 |
70 render_frame_host_ = new_render_frame_host; | 69 render_frame_host_ = new_render_frame_host; |
71 } | 70 } |
72 | 71 |
73 } // namespace content | 72 } // namespace content |
OLD | NEW |