| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 68 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 69 FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer(); | 69 FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer(); |
| 70 FrameTreeNodeIdMap::iterator it = nodes->find(frame_tree_node_id); | 70 FrameTreeNodeIdMap::iterator it = nodes->find(frame_tree_node_id); |
| 71 return it == nodes->end() ? nullptr : it->second; | 71 return it == nodes->end() ? nullptr : it->second; |
| 72 } | 72 } |
| 73 | 73 |
| 74 FrameTreeNode::FrameTreeNode( | 74 FrameTreeNode::FrameTreeNode( |
| 75 FrameTree* frame_tree, | 75 FrameTree* frame_tree, |
| 76 Navigator* navigator, | 76 Navigator* navigator, |
| 77 RenderFrameHostDelegate* render_frame_delegate, | 77 RenderFrameHostDelegate* render_frame_delegate, |
| 78 RenderViewHostDelegate* render_view_delegate, | |
| 79 RenderWidgetHostDelegate* render_widget_delegate, | 78 RenderWidgetHostDelegate* render_widget_delegate, |
| 80 RenderFrameHostManager::Delegate* manager_delegate, | 79 RenderFrameHostManager::Delegate* manager_delegate, |
| 81 blink::WebTreeScopeType scope, | 80 blink::WebTreeScopeType scope, |
| 82 const std::string& name, | 81 const std::string& name, |
| 83 const std::string& unique_name, | 82 const std::string& unique_name, |
| 84 const blink::WebFrameOwnerProperties& frame_owner_properties) | 83 const blink::WebFrameOwnerProperties& frame_owner_properties) |
| 85 : frame_tree_(frame_tree), | 84 : frame_tree_(frame_tree), |
| 86 navigator_(navigator), | 85 navigator_(navigator), |
| 87 render_manager_(this, | 86 render_manager_(this, |
| 88 render_frame_delegate, | 87 render_frame_delegate, |
| 89 render_view_delegate, | |
| 90 render_widget_delegate, | 88 render_widget_delegate, |
| 91 manager_delegate), | 89 manager_delegate), |
| 92 frame_tree_node_id_(next_frame_tree_node_id_++), | 90 frame_tree_node_id_(next_frame_tree_node_id_++), |
| 93 parent_(NULL), | 91 parent_(NULL), |
| 94 opener_(nullptr), | 92 opener_(nullptr), |
| 95 opener_observer_(nullptr), | 93 opener_observer_(nullptr), |
| 96 has_committed_real_load_(false), | 94 has_committed_real_load_(false), |
| 97 replication_state_( | 95 replication_state_( |
| 98 scope, | 96 scope, |
| 99 name, | 97 name, |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 void FrameTreeNode::TraceSnapshot() const { | 481 void FrameTreeNode::TraceSnapshot() const { |
| 484 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 482 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 485 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( | 483 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
| 486 "navigation", "FrameTreeNode", | 484 "navigation", "FrameTreeNode", |
| 487 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), | 485 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| 488 std::unique_ptr<base::trace_event::ConvertableToTraceFormat>( | 486 std::unique_ptr<base::trace_event::ConvertableToTraceFormat>( |
| 489 new TracedFrameTreeNode(*this))); | 487 new TracedFrameTreeNode(*this))); |
| 490 } | 488 } |
| 491 | 489 |
| 492 } // namespace content | 490 } // namespace content |
| OLD | NEW |