Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: content/browser/frame_host/frame_tree_node.cc

Issue 1221083007: PlzNavigate: remove extraneous DidStartLoading IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed comment Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 RenderFrameHostImpl* speculative_frame_host =
240 render_manager_.speculative_frame_host();
241 if (speculative_frame_host && speculative_frame_host->is_loading())
242 return true;
238 } else { 243 } else {
239 if (pending_frame_host && pending_frame_host->is_loading()) 244 if (pending_frame_host && pending_frame_host->is_loading())
240 return true; 245 return true;
241 } 246 }
242 return current_frame_host->is_loading(); 247 return current_frame_host->is_loading();
243 } 248 }
244 249
245 bool FrameTreeNode::CommitPendingSandboxFlags() { 250 bool FrameTreeNode::CommitPendingSandboxFlags() {
246 bool did_change_flags = 251 bool did_change_flags =
247 effective_sandbox_flags_ != replication_state_.sandbox_flags; 252 effective_sandbox_flags_ != replication_state_.sandbox_flags;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 FROM_HERE_WITH_EXPLICIT_FUNCTION( 354 FROM_HERE_WITH_EXPLICIT_FUNCTION(
350 "465796 FrameTreeNode::DidStopLoading::End")); 355 "465796 FrameTreeNode::DidStopLoading::End"));
351 } 356 }
352 357
353 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { 358 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
354 loading_progress_ = load_progress; 359 loading_progress_ = load_progress;
355 frame_tree_->UpdateLoadProgress(); 360 frame_tree_->UpdateLoadProgress();
356 } 361 }
357 362
358 } // namespace content 363 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698