| 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id); | 46 FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id); |
| 47 return it == nodes->end() ? nullptr : it->second; | 47 return it == nodes->end() ? nullptr : it->second; |
| 48 } | 48 } |
| 49 | 49 |
| 50 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree, | 50 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree, |
| 51 Navigator* navigator, | 51 Navigator* navigator, |
| 52 RenderFrameHostDelegate* render_frame_delegate, | 52 RenderFrameHostDelegate* render_frame_delegate, |
| 53 RenderViewHostDelegate* render_view_delegate, | 53 RenderViewHostDelegate* render_view_delegate, |
| 54 RenderWidgetHostDelegate* render_widget_delegate, | 54 RenderWidgetHostDelegate* render_widget_delegate, |
| 55 RenderFrameHostManager::Delegate* manager_delegate, | 55 RenderFrameHostManager::Delegate* manager_delegate, |
| 56 blink::WebTreeScopeType scope, |
| 56 const std::string& name, | 57 const std::string& name, |
| 57 SandboxFlags sandbox_flags) | 58 SandboxFlags sandbox_flags) |
| 58 : frame_tree_(frame_tree), | 59 : frame_tree_(frame_tree), |
| 59 navigator_(navigator), | 60 navigator_(navigator), |
| 60 render_manager_(this, | 61 render_manager_(this, |
| 61 render_frame_delegate, | 62 render_frame_delegate, |
| 62 render_view_delegate, | 63 render_view_delegate, |
| 63 render_widget_delegate, | 64 render_widget_delegate, |
| 64 manager_delegate), | 65 manager_delegate), |
| 65 frame_tree_node_id_(next_frame_tree_node_id_++), | 66 frame_tree_node_id_(next_frame_tree_node_id_++), |
| 66 parent_(NULL), | 67 parent_(NULL), |
| 67 replication_state_(name, sandbox_flags), | 68 replication_state_(scope, name, sandbox_flags), |
| 68 // Effective sandbox flags also need to be set, since initial sandbox | 69 // Effective sandbox flags also need to be set, since initial sandbox |
| 69 // flags should apply to the initial empty document in the frame. | 70 // flags should apply to the initial empty document in the frame. |
| 70 effective_sandbox_flags_(sandbox_flags), | 71 effective_sandbox_flags_(sandbox_flags), |
| 71 loading_progress_(kLoadingProgressNotStarted) { | 72 loading_progress_(kLoadingProgressNotStarted) { |
| 72 std::pair<FrameTreeNodeIDMap::iterator, bool> result = | 73 std::pair<FrameTreeNodeIDMap::iterator, bool> result = |
| 73 g_frame_tree_node_id_map.Get().insert( | 74 g_frame_tree_node_id_map.Get().insert( |
| 74 std::make_pair(frame_tree_node_id_, this)); | 75 std::make_pair(frame_tree_node_id_, this)); |
| 75 CHECK(result.second); | 76 CHECK(result.second); |
| 76 } | 77 } |
| 77 | 78 |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 300 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 300 "465796 FrameTreeNode::DidStopLoading::End")); | 301 "465796 FrameTreeNode::DidStopLoading::End")); |
| 301 } | 302 } |
| 302 | 303 |
| 303 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { | 304 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { |
| 304 loading_progress_ = load_progress; | 305 loading_progress_ = load_progress; |
| 305 frame_tree_->UpdateLoadProgress(); | 306 frame_tree_->UpdateLoadProgress(); |
| 306 } | 307 } |
| 307 | 308 |
| 308 } // namespace content | 309 } // namespace content |
| OLD | NEW |