PlzNavigate: send Javascript urls synchronously to the renderer

content/browser/frame_host/navigator_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/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 699 matching lines @@
         new ViewMsg_EnableViewSourceMode(
             render_frame_host->render_view_host()->GetRoutingID()));
   }
 
   CheckWebUIRendererDoesNotDisplayNormalURL(
       render_frame_host, navigation_request->common_params().url);
 
   render_frame_host->CommitNavigation(response, body.Pass(),
                                       navigation_request->common_params(),
                                       navigation_request->request_params());
+
+  // When navigating to a Javascript url, no commit is expected from the
+  // RenderFrameHost, therefore the NavigationRequest should be reset right now.
+  if (navigation_request->common_params().url.SchemeIs(url::kJavaScriptScheme))
+    frame_tree_node->ResetNavigationRequest(true);
 }
 
 // PlzNavigate
 void NavigatorImpl::FailedNavigation(FrameTreeNode* frame_tree_node,
                                      bool has_stale_copy_in_cache,
                                      int error_code) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
 
   NavigationRequest* navigation_request = frame_tree_node->navigation_request();
@@ skipping 83 matching lines @@
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   DCHECK(frame_tree_node);
   FrameMsg_Navigate_Type::Value navigation_type =
       GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
   scoped_ptr<NavigationRequest> navigation_request =
       NavigationRequest::CreateBrowserInitiated(frame_tree_node, entry,
                                                 navigation_type,
                                                 navigation_start, controller_);
   frame_tree_node->SetNavigationRequest(navigation_request.Pass());
+  frame_tree_node->navigation_request()->SetWaitingForRendererResponse();
 
   // Have the current renderer execute its beforeUnload event if needed. If it
   // is not needed (eg. the renderer is not live), BeginNavigation should get
-  // called.
-  frame_tree_node->navigation_request()->SetWaitingForRendererResponse();
-  frame_tree_node->current_frame_host()->DispatchBeforeUnload(true);
+  // called. If the navigation is synchronous and same-site, then it can be sent
+  // directly to the renderer (currently this is the case for navigations that
+  // do not make network requests such as data urls or Javascript urls).
+  if (NavigationRequest::ShouldMakeNetworkRequest(
+          frame_tree_node->navigation_request()->common_params().url)) {
+    frame_tree_node->current_frame_host()->DispatchBeforeUnload(true);
+  } else {
+    BeginNavigation(frame_tree_node);
+  }
 }
 
 void NavigatorImpl::BeginNavigation(FrameTreeNode* frame_tree_node) {
   NavigationRequest* navigation_request = frame_tree_node->navigation_request();
 
   // A browser-initiated navigation could have been cancelled while it was
   // waiting for the BeforeUnload event to execute.
   if (!navigation_request)
     return;
 
@@ skipping 54 matching lines @@
         "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_commit);
     UMA_HISTOGRAM_TIMES(
         "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_network);
   }
   navigation_data_.reset();
 }
 
 }  // namespace content