| 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 26 matching lines...) Expand all Loading... |
| 37 *out_node = node; | 37 *out_node = node; |
| 38 // Terminate iteration once the node has been found. | 38 // Terminate iteration once the node has been found. |
| 39 return false; | 39 return false; |
| 40 } | 40 } |
| 41 return true; | 41 return true; |
| 42 } | 42 } |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 | 45 |
| 46 FrameTree::FrameTree(Navigator* navigator, | 46 FrameTree::FrameTree(Navigator* navigator, |
| 47 RenderFrameHostDelegate* render_frame_delegate, |
| 47 RenderViewHostDelegate* render_view_delegate, | 48 RenderViewHostDelegate* render_view_delegate, |
| 48 RenderWidgetHostDelegate* render_widget_delegate, | 49 RenderWidgetHostDelegate* render_widget_delegate, |
| 49 RenderFrameHostManager::Delegate* manager_delegate) | 50 RenderFrameHostManager::Delegate* manager_delegate) |
| 50 : render_view_delegate_(render_view_delegate), | 51 : render_frame_delegate_(render_frame_delegate), |
| 52 render_view_delegate_(render_view_delegate), |
| 51 render_widget_delegate_(render_widget_delegate), | 53 render_widget_delegate_(render_widget_delegate), |
| 52 manager_delegate_(manager_delegate), | 54 manager_delegate_(manager_delegate), |
| 53 root_(new FrameTreeNode(navigator, | 55 root_(new FrameTreeNode(navigator, |
| 56 render_frame_delegate, |
| 54 render_view_delegate, | 57 render_view_delegate, |
| 55 render_widget_delegate, | 58 render_widget_delegate, |
| 56 manager_delegate, | 59 manager_delegate, |
| 57 FrameTreeNode::kInvalidFrameId, | 60 FrameTreeNode::kInvalidFrameId, |
| 58 std::string(), | 61 std::string(), |
| 59 scoped_ptr<RenderFrameHostImpl>())) { | 62 scoped_ptr<RenderFrameHostImpl>())) { |
| 60 } | 63 } |
| 61 | 64 |
| 62 FrameTree::~FrameTree() { | 65 FrameTree::~FrameTree() { |
| 63 } | 66 } |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 165 |
| 163 scoped_ptr<FrameTreeNode> FrameTree::CreateNode( | 166 scoped_ptr<FrameTreeNode> FrameTree::CreateNode( |
| 164 int64 frame_id, | 167 int64 frame_id, |
| 165 const std::string& frame_name, | 168 const std::string& frame_name, |
| 166 int render_frame_host_id, | 169 int render_frame_host_id, |
| 167 Navigator* navigator, | 170 Navigator* navigator, |
| 168 RenderProcessHost* render_process_host) { | 171 RenderProcessHost* render_process_host) { |
| 169 scoped_ptr<RenderFrameHostImpl> render_frame_host( | 172 scoped_ptr<RenderFrameHostImpl> render_frame_host( |
| 170 RenderFrameHostFactory::Create( | 173 RenderFrameHostFactory::Create( |
| 171 root_->render_frame_host()->render_view_host(), | 174 root_->render_frame_host()->render_view_host(), |
| 175 root_->render_frame_host()->delegate(), |
| 172 this, | 176 this, |
| 173 render_frame_host_id, | 177 render_frame_host_id, |
| 174 false)); | 178 false)); |
| 175 | 179 |
| 176 return make_scoped_ptr(new FrameTreeNode(navigator, | 180 return make_scoped_ptr(new FrameTreeNode(navigator, |
| 177 render_view_delegate_, render_widget_delegate_, manager_delegate_, | 181 render_frame_delegate_, render_view_delegate_, render_widget_delegate_, |
| 178 frame_id, frame_name, render_frame_host.Pass())); | 182 manager_delegate_, frame_id, frame_name, render_frame_host.Pass())); |
| 179 } | 183 } |
| 180 | 184 |
| 181 } // namespace content | 185 } // namespace content |
| OLD | NEW |