PlzNavigate: Create the speculative renderer earlier.

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 1660 matching lines @@
       params.user_gesture);
 }
 
 void RenderFrameHostImpl::Stop() {
   Send(new FrameMsg_Stop(routing_id_));
 }
 
 void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation) {
   // TODO(creis): Support beforeunload on subframes.  For now just pretend that
   // the handler ran and allowed the navigation to proceed.
-  if (GetParent() || !IsRenderFrameLive()) {
-    // We don't have a live renderer, so just skip running beforeunload.
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableBrowserSideNavigation)) {
-      frame_tree_node_->navigator()->OnBeforeUnloadACK(
-          frame_tree_node_, true);
-    } else {
-      frame_tree_node_->render_manager()->OnBeforeUnloadACK(
-          for_navigation, true, base::TimeTicks::Now());
-    }
+  if (!ShouldDispatchBeforeUnload()) {
+    // There's no live renderer or this is a subframe, so just skip running

[nasko, 2015/06/12 17:22:22]

ShouldDispatchBeforeUnload should be clear enough without need to comment on the
decision behind it. It invites stale comments if the implementation changes.

[carlosk, 2015/06/15 19:11:54]

Done.

+    // BeforeUnload.

[nasko, 2015/06/12 17:22:22]

nit: Keep the capitalization intact (aka no capitalization).

[carlosk, 2015/06/15 19:11:54]

Done.

+    DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
+               switches::kEnableBrowserSideNavigation) ||
+           !for_navigation);

[nasko, 2015/06/12 17:22:22]

!A || !B is the same as !(A && B), but is a bit more readable.

[carlosk, 2015/06/15 19:11:54]

Done.

+    frame_tree_node_->render_manager()->OnBeforeUnloadACK(
+        for_navigation, true, base::TimeTicks::Now());
     return;
   }
   TRACE_EVENT_ASYNC_BEGIN0(
       "navigation", "RenderFrameHostImpl::BeforeUnload", this);
 
   // This may be called more than once (if the user clicks the tab close button
   // several times, or if she clicks the tab close button then the browser close
   // button), and we only send the message once.
   if (is_waiting_for_beforeunload_ack_) {
     // Some of our close messages could be for the tab, others for cross-site
@@ skipping 12 matching lines @@
     // Increment the in-flight event count, to ensure that input events won't
     // cancel the timeout timer.
     render_view_host_->increment_in_flight_event_count();
     render_view_host_->StartHangMonitorTimeout(
         TimeDelta::FromMilliseconds(RenderViewHostImpl::kUnloadTimeoutMS));
     send_before_unload_start_time_ = base::TimeTicks::Now();
     Send(new FrameMsg_BeforeUnload(routing_id_));
   }
 }
 
+bool RenderFrameHostImpl::ShouldDispatchBeforeUnload() {
+  // TODO(creis): Support beforeunload on subframes.
+  return !GetParent() && IsRenderFrameLive();
+}
+
 void RenderFrameHostImpl::DisownOpener() {
   Send(new FrameMsg_DisownOpener(GetRoutingID()));
 }
 
 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before,
                                                    size_t after) {
   Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after));
 }
 
 void RenderFrameHostImpl::JavaScriptDialogClosed(
@@ skipping 335 matching lines @@
   // We may be returning to an existing NavigationEntry that had been granted
   // file access.  If this is a different process, we will need to grant the
   // access again.  The files listed in the page state are validated when they
   // are received from the renderer to prevent abuse.
   if (request_params.page_state.IsValid()) {
     render_view_host_->GrantFileAccessFromPageState(request_params.page_state);
   }
 }
 
 }  // namespace content