PlzNavigate: Call DidStartLoading and DidStopLoading.

content/browser/frame_host/frame_tree_node.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 148 matching lines @@
   return false;
 }
 
 bool FrameTreeNode::IsLoading() const {
   RenderFrameHostImpl* current_frame_host =
       render_manager_.current_frame_host();
   RenderFrameHostImpl* pending_frame_host =
       render_manager_.pending_frame_host();
 
   DCHECK(current_frame_host);
-  // TODO(fdegans): Change the implementation logic for PlzNavigate once
-  // DidStartLoading and DidStopLoading are properly called.
-  if (pending_frame_host && pending_frame_host->is_loading())
-    return true;
+
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation)) {
+    if (navigation_request_)
+      return true;
+  } else {
+    if (pending_frame_host && pending_frame_host->is_loading())
+      return true;
+  }
   return current_frame_host->is_loading();
 }
 
 bool FrameTreeNode::CommitPendingSandboxFlags() {
   bool did_change_flags =
       effective_sandbox_flags_ != replication_state_.sandbox_flags;
   effective_sandbox_flags_ = replication_state_.sandbox_flags;
   return did_change_flags;
 }
 
 void FrameTreeNode::SetNavigationRequest(
     scoped_ptr<NavigationRequest> navigation_request) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   ResetNavigationRequest(false);
-  // TODO(clamy): perform the StartLoading logic here.
+
+  // Force the throbber to start to keep it in sync with what is happening in
+  // the UI. Blink doesn't send throb notifications for JavaScript URLs, so it
+  // is not done here either.
+  if (!navigation_request->common_params().url.SchemeIs(
+          url::kJavaScriptScheme)) {
+    // TODO(fdegans): Check if this is a same-document navigation and set the
+    // proper argument.
+    DidStartLoading(true);
+  }
+
   navigation_request_ = navigation_request.Pass();
 }
 
 void FrameTreeNode::ResetNavigationRequest(bool is_commit) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
-  // Upon commit the current NavigationRequest will be reset. There should be no
-  // cleanup performed since the navigation is still ongoing. If the reset
-  // corresponds to a cancelation, the RenderFrameHostManager should clean up
-  // any speculative RenderFrameHost it created for the navigation.
-  if (navigation_request_ && !is_commit) {
-    // TODO(clamy): perform the StopLoading logic.
-    render_manager_.CleanUpNavigation();
-  }
+  if (!navigation_request_)
+    return;
   navigation_request_.reset();
+
+  // During commit, the clean up of a speculative RenderFrameHost is done in
+  // RenderFrameHostManager::DidNavigateFrame. The load is also still being
+  // tracked.
+  if (is_commit)
+    return;
+
+  // If the reset corresponds to a cancelation, the RenderFrameHostManager
+  // should clean up any speculative RenderFrameHost it created for the
+  // navigation.
+  DidStopLoading();
+  render_manager_.CleanUpNavigation();
 }
 
 bool FrameTreeNode::has_started_loading() const {
   return loading_progress_ != kLoadingProgressNotStarted;
 }
 
 void FrameTreeNode::reset_loading_progress() {
   loading_progress_ = kLoadingProgressNotStarted;
 }
 
@@ skipping 48 matching lines @@
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "465796 FrameTreeNode::DidStopLoading::End"));
 }
 
 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
   loading_progress_ = load_progress;
   frame_tree_->UpdateLoadProgress();
 }
 
 }  // namespace content