| 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.h" | 5 #include "content/browser/frame_host/frame_tree.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 if (node->frame_id() == frame_id) { | 35 if (node->frame_id() == frame_id) { |
| 36 *out_node = node; | 36 *out_node = node; |
| 37 // Terminate iteration once the node has been found. | 37 // Terminate iteration once the node has been found. |
| 38 return false; | 38 return false; |
| 39 } | 39 } |
| 40 return true; | 40 return true; |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 FrameTree::FrameTree(Navigator* navigator) | 45 FrameTree::FrameTree(Navigator* navigator, |
| 46 : root_(new FrameTreeNode(FrameTreeNode::kInvalidFrameId, std::string(), | 46 RenderViewHostDelegate* render_view_delegate, |
| 47 navigator, scoped_ptr<RenderFrameHostImpl>())) { | 47 RenderWidgetHostDelegate* render_widget_delegate, |
| 48 RenderViewHostManager::Delegate* manager_delegate) |
| 49 : render_view_delegate_(render_view_delegate), |
| 50 render_widget_delegate_(render_widget_delegate), |
| 51 manager_delegate_(manager_delegate), |
| 52 root_(new FrameTreeNode(render_view_delegate, |
| 53 render_widget_delegate, |
| 54 manager_delegate, |
| 55 FrameTreeNode::kInvalidFrameId, |
| 56 std::string(), |
| 57 navigator, |
| 58 scoped_ptr<RenderFrameHostImpl>())) { |
| 48 } | 59 } |
| 49 | 60 |
| 50 FrameTree::~FrameTree() { | 61 FrameTree::~FrameTree() { |
| 51 } | 62 } |
| 52 | 63 |
| 53 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) { | 64 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) { |
| 54 FrameTreeNode* node = NULL; | 65 FrameTreeNode* node = NULL; |
| 55 ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node)); | 66 ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node)); |
| 56 return node; | 67 return node; |
| 57 } | 68 } |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 int64 frame_id, | 163 int64 frame_id, |
| 153 const std::string& frame_name, | 164 const std::string& frame_name, |
| 154 int render_frame_host_id, | 165 int render_frame_host_id, |
| 155 Navigator* navigator, | 166 Navigator* navigator, |
| 156 RenderProcessHost* render_process_host) { | 167 RenderProcessHost* render_process_host) { |
| 157 scoped_ptr<RenderFrameHostImpl> render_frame_host( | 168 scoped_ptr<RenderFrameHostImpl> render_frame_host( |
| 158 new RenderFrameHostImpl(root_->render_frame_host()->render_view_host(), | 169 new RenderFrameHostImpl(root_->render_frame_host()->render_view_host(), |
| 159 this, render_frame_host_id, false)); | 170 this, render_frame_host_id, false)); |
| 160 | 171 |
| 161 return make_scoped_ptr(new FrameTreeNode( | 172 return make_scoped_ptr(new FrameTreeNode( |
| 173 render_view_delegate_, render_widget_delegate_, manager_delegate_, |
| 162 frame_id, frame_name, navigator, render_frame_host.Pass())); | 174 frame_id, frame_name, navigator, render_frame_host.Pass())); |
| 163 } | 175 } |
| 164 | 176 |
| 165 } // namespace content | 177 } // namespace content |
| OLD | NEW |