| 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/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| 11 #include "content/browser/frame_host/navigator.h" | 11 #include "content/browser/frame_host/navigator.h" |
| 12 #include "content/browser/frame_host/render_frame_host_impl.h" | 12 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 13 #include "content/browser/renderer_host/render_view_host_impl.h" | 13 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 | 16 |
| 17 const int64 FrameTreeNode::kInvalidFrameId = -1; | |
| 18 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; | 17 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; |
| 19 | 18 |
| 20 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree, | 19 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree, |
| 21 Navigator* navigator, | 20 Navigator* navigator, |
| 22 RenderFrameHostDelegate* render_frame_delegate, | 21 RenderFrameHostDelegate* render_frame_delegate, |
| 23 RenderViewHostDelegate* render_view_delegate, | 22 RenderViewHostDelegate* render_view_delegate, |
| 24 RenderWidgetHostDelegate* render_widget_delegate, | 23 RenderWidgetHostDelegate* render_widget_delegate, |
| 25 RenderFrameHostManager::Delegate* manager_delegate, | 24 RenderFrameHostManager::Delegate* manager_delegate, |
| 26 int64 frame_id, | |
| 27 const std::string& name) | 25 const std::string& name) |
| 28 : frame_tree_(frame_tree), | 26 : frame_tree_(frame_tree), |
| 29 navigator_(navigator), | 27 navigator_(navigator), |
| 30 render_manager_(this, | 28 render_manager_(this, |
| 31 render_frame_delegate, | 29 render_frame_delegate, |
| 32 render_view_delegate, | 30 render_view_delegate, |
| 33 render_widget_delegate, | 31 render_widget_delegate, |
| 34 manager_delegate), | 32 manager_delegate), |
| 35 frame_tree_node_id_(next_frame_tree_node_id_++), | 33 frame_tree_node_id_(next_frame_tree_node_id_++), |
| 36 frame_id_(frame_id), | |
| 37 frame_name_(name) { | 34 frame_name_(name) { |
| 38 } | 35 } |
| 39 | 36 |
| 40 FrameTreeNode::~FrameTreeNode() { | 37 FrameTreeNode::~FrameTreeNode() { |
| 41 } | 38 } |
| 42 | 39 |
| 43 bool FrameTreeNode::IsMainFrame() const { | 40 bool FrameTreeNode::IsMainFrame() const { |
| 44 return frame_tree_->root() == this; | 41 return frame_tree_->root() == this; |
| 45 } | 42 } |
| 46 | 43 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 63 for (iter = children_.begin(); iter != children_.end(); ++iter) { | 60 for (iter = children_.begin(); iter != children_.end(); ++iter) { |
| 64 if ((*iter) == child) | 61 if ((*iter) == child) |
| 65 break; | 62 break; |
| 66 } | 63 } |
| 67 | 64 |
| 68 if (iter != children_.end()) | 65 if (iter != children_.end()) |
| 69 children_.erase(iter); | 66 children_.erase(iter); |
| 70 } | 67 } |
| 71 | 68 |
| 72 void FrameTreeNode::ResetForMainFrameSwap() { | 69 void FrameTreeNode::ResetForMainFrameSwap() { |
| 73 frame_id_ = kInvalidFrameId; | |
| 74 current_url_ = GURL(); | 70 current_url_ = GURL(); |
| 75 | 71 |
| 76 // The children may not have been cleared if a cross-process navigation | 72 // The children may not have been cleared if a cross-process navigation |
| 77 // commits before the old process cleans everything up. Make sure the child | 73 // commits before the old process cleans everything up. Make sure the child |
| 78 // nodes get deleted. | 74 // nodes get deleted. |
| 79 children_.clear(); | 75 children_.clear(); |
| 80 } | 76 } |
| 81 | 77 |
| 82 } // namespace content | 78 } // namespace content |
| OLD | NEW |