PlzNavigate: implement CommitNavigation on the browser side

content/browser/frame_host/render_frame_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/referrer.h"
 
 struct FrameHostMsg_BeginNavigation_Params;
+struct FrameMsg_CommitNavigation_Params;
 struct FrameMsg_Navigate_Params;
 
 namespace content {
 class BrowserContext;
 class CrossProcessFrameConnector;
 class CrossSiteTransferringRequest;
 class InterstitialPageImpl;
 class FrameTreeNode;
 class NavigationControllerImpl;
 class NavigationEntry;
@@ skipping 278 matching lines @@
   void ResetProxyHosts();
 
   // Returns the routing id for a RenderFrameHost or RenderFrameHostProxy
   // that has the given SiteInstance and is associated with this
   // RenderFrameHostManager. Returns MSG_ROUTING_NONE if none is found.
   int GetRoutingIdForSiteInstance(SiteInstance* site_instance);
 
   // PlzNavigate: sends a RequestNavigation IPC to the renderer to ask it to
   // navigate. If no live renderer is present, then the navigation request will
   // be sent directly to the ResourceDispatcherHost.
-  bool RequestNavigation(const NavigationEntryImpl& entry,
-                         const FrameMsg_Navigate_Params& navigate_params);
+  bool RequestNavigation(
+      scoped_ptr<FrameMsg_CommitNavigation_Params> commit_navigation_params,

[(Do not use) nasko, 2014/08/28 16:39:09]

Why do we need to have commit parameters at the RequestNavigation time?

[clamy, 2014/09/02 18:25:19]

Because they depend on information stored in the NavigationEntry, and in the
discussion about the previous CL, we agreed that we should not depend on the
pending entry of the NavigationController. Which means that the only moment
where we have access to the NavigationEntry is when we are asked to navigate,
that is on RequestNavigation.

[nasko, 2014/09/03 16:30:26]

Yes, I agree that we shouldn't depend on NavigationEntry. One idea I was
discussing with Charlie is to have one structure that follows a full navigation
from the beginning to the end, carrying the common data that needs to be passed
around. Things like referrer and redirect chain can be part of it and we can
easily track it around. Each specific IPC can use that structure for the common
parts and additional params struct for the IPC specific parts. What do you
think?

[clamy, 2014/09/03 17:15:15]

I think that would work. This is essentially what the
FrameMsg_CommitNavigation_Params are doing here. Initially, I did not want to
add an additional structure (because we do have _plenty_ of structures already).
However, reading the code again, it may be more understandable than having the
FrameMsg_CommitNavigation_Params so early in the navigation.

+      const FrameMsg_Navigate_Params& navigate_params);
 
   // PlzNavigate: Used to start a navigation. OnBeginNavigation is called
   // directly by RequestNavigation when there is no live renderer. Otherwise, it
   // is called following a BeginNavigation IPC from the renderer (which in
   // browser-initiated navigation also happens after RequestNavigation has been
   // called).
   void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params);
 
   // PlzNavigate: Called when a navigation request has received a response, to
   // select a renderer to use for the navigation.
@@ skipping 197 matching lines @@
   // The intersitial page currently shown if any, not own by this class
   // (the InterstitialPage is self-owned, it deletes itself when hidden).
   InterstitialPageImpl* interstitial_page_;
 
   NotificationRegistrar registrar_;
 
   // PlzNavigate: Owns a navigation request that originated in that frame until
   // it commits.
   scoped_ptr<NavigationRequest> navigation_request_;
 
+  // PlzNaigate: Holds info that should be sent to the renderer when the
+  // navigation is about to commit.
+  scoped_ptr<FrameMsg_CommitNavigation_Params> commit_navigation_params_;
+
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_