Chromium Code Reviews| 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 render_manager_.current_frame_host(); | 228 render_manager_.current_frame_host(); |
| 229 RenderFrameHostImpl* pending_frame_host = | 229 RenderFrameHostImpl* pending_frame_host = |
| 230 render_manager_.pending_frame_host(); | 230 render_manager_.pending_frame_host(); |
| 231 | 231 |
| 232 DCHECK(current_frame_host); | 232 DCHECK(current_frame_host); |
| 233 | 233 |
| 234 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 234 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 235 switches::kEnableBrowserSideNavigation)) { | 235 switches::kEnableBrowserSideNavigation)) { |
| 236 if (navigation_request_) | 236 if (navigation_request_) |
| 237 return true; | 237 return true; |
| 238 | |
| 239 // Check if a navigation is about ot commit in the speculative | |
|
Fabrice (no longer in Chrome)
2015/07/07 15:16:35
nit: s/ot/to/
nasko
2015/07/07 15:18:57
nit: Does it really matter whether it is about to
clamy
2015/07/07 15:23:58
Well it should only tell us that it is loading whe
| |
| 240 // RenderFrameHost. | |
| 241 RenderFrameHostImpl* speculative_frame_host = | |
| 242 render_manager_.speculative_frame_host(); | |
| 243 if (speculative_frame_host && speculative_frame_host->is_loading()) | |
| 244 return true; | |
| 238 } else { | 245 } else { |
| 239 if (pending_frame_host && pending_frame_host->is_loading()) | 246 if (pending_frame_host && pending_frame_host->is_loading()) |
| 240 return true; | 247 return true; |
| 241 } | 248 } |
| 242 return current_frame_host->is_loading(); | 249 return current_frame_host->is_loading(); |
| 243 } | 250 } |
| 244 | 251 |
| 245 bool FrameTreeNode::CommitPendingSandboxFlags() { | 252 bool FrameTreeNode::CommitPendingSandboxFlags() { |
| 246 bool did_change_flags = | 253 bool did_change_flags = |
| 247 effective_sandbox_flags_ != replication_state_.sandbox_flags; | 254 effective_sandbox_flags_ != replication_state_.sandbox_flags; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 349 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 356 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 350 "465796 FrameTreeNode::DidStopLoading::End")); | 357 "465796 FrameTreeNode::DidStopLoading::End")); |
| 351 } | 358 } |
| 352 | 359 |
| 353 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { | 360 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { |
| 354 loading_progress_ = load_progress; | 361 loading_progress_ = load_progress; |
| 355 frame_tree_->UpdateLoadProgress(); | 362 frame_tree_->UpdateLoadProgress(); |
| 356 } | 363 } |
| 357 | 364 |
| 358 } // namespace content | 365 } // namespace content |
| OLD | NEW |