PlzNavigate: Use WebNavigationPolicyHandledByClient

content/browser/frame_host/render_frame_host_impl.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/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 1024 matching lines @@
   // compositor output (possibly because of script deliberately creating this
   // situation) then we clear it after a while anyway.
   // See https://crbug.com/497588.
   if (frame_tree_node_->IsMainFrame() && GetView() &&
       !validated_params.was_within_same_page) {
     RenderWidgetHostImpl::From(GetView()->GetRenderWidgetHost())
         ->StartNewContentRenderingTimeout();
   }
 
   // PlzNavigate
-  if (IsBrowserSideNavigationEnabled())
+  if (IsBrowserSideNavigationEnabled()) {
+    // PlzNavigate: synchronous loads happen in the renderer, and the browser
+    // has not been notified about the start of the load yet. Do it now.
+    if (!is_loading()) {

[nasko, 2016/02/03 22:28:14]

Why not put this in the same section above, where we make a decision that this
is a synchronous navigation?

[clamy, 2016/02/10 16:39:35]

Done.

+      is_loading_ = true;
+      frame_tree_node()->DidStartLoading(true, false);
+    }
     pending_commit_ = false;
+  }
 }
 
 void RenderFrameHostImpl::OnUpdateState(const PageState& state) {
   // TODO(creis): Verify the state's ISN matches the last committed FNE.
 
   // Without this check, the renderer can trick the browser into using
   // filenames it can't access in a future session restore.
   // TODO(creis): Move CanAccessFilesOfPageState to RenderFrameHostImpl.
   if (!render_view_host_->CanAccessFilesOfPageState(state)) {
     bad_message::ReceivedBadMessage(
@@ skipping 630 matching lines @@
     delegate_->EnterFullscreenMode(GetLastCommittedURL().GetOrigin());
   else
     delegate_->ExitFullscreenMode(/* will_cause_resize */ true);
 
   // The previous call might change the fullscreen state. We need to make sure
   // the renderer is aware of that, which is done via the resize message.
   render_view_host_->GetWidget()->WasResized();
 }
 
 void RenderFrameHostImpl::OnDidStartLoading(bool to_different_document) {
+  // PlzNavigate: the browser is responsible for knowing the start of all
+  // non-synchronous navigations.
+  if (IsBrowserSideNavigationEnabled() && to_different_document)
+    return;

[carlosk, 2016/02/03 12:41:56]

Instead of ignoring shouldn't we stop it from being sent from the renderer in
case the navigation is to a different document? Otherwise maybe add a DCHECK
here that is_loading is set to true.

[clamy, 2016/02/10 16:39:35]

Done.

+
   bool was_previously_loading = frame_tree_node_->frame_tree()->IsLoading();
   is_loading_ = true;
   frame_tree_node_->DidStartLoading(to_different_document,
                                     was_previously_loading);
 }
 
 void RenderFrameHostImpl::OnDidStopLoading() {
   // This method should never be called when the frame is not loading.
   // Unfortunately, it can happen if a history navigation happens during a
   // BeforeUnload or Unload event.
@@ skipping 844 matching lines @@
   *dst = src;
 
   if (src.routing_id != -1)
     dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
 
   if (src.parent_routing_id != -1)
     dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
 }
 
 }  // namespace content