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"
@@ skipping 25 matching lines @@
 class RenderFrameHostImpl;
 class RenderFrameHostManagerTest;
 class RenderFrameProxyHost;
 class RenderViewHost;
 class RenderViewHostImpl;
 class RenderWidgetHostDelegate;
 class RenderWidgetHostView;
 class TestWebContents;
 class WebUIImpl;
 struct NavigationBeforeCommitInfo;
+struct NavigationParamsWithRequestAndCommitInfo;
 
 // Manages RenderFrameHosts for a FrameTreeNode.  This class acts as a state
 // machine to make cross-process navigations in a frame possible.
 class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
  public:
   // Functions implemented by our owner that we need.
   //
   // TODO(brettw) Clean this up! These are all the functions in WebContentsImpl
   // that are required to run this class. The design should probably be better
   // such that these are more clear.
@@ skipping 253 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<NavigationParamsWithRequestAndCommitInfo> navigation_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_;
 
+  // PlzNavigate: Holds info that should be sent to the renderer when the
+  // navigation is about to commit.
+  scoped_ptr<NavigationParamsWithRequestAndCommitInfo> navigation_params_;

[Charlie Reis, 2014/09/15 21:19:40]

I want to be careful before we add navigation-specific state to RFHM.  We've
just eliminated the old PendingNavigationParams, and PlzNavigate will let us
eliminate pending_render_frame_host_ as well.  It would be nice if RFHM just
managed the RenderFrameHosts and didn't know about the navigation details.

Is there another way to handle this data?  Can we avoid storing it as state at
all?  (Maybe this is the right place, but it would be nice to avoid if we can.)

[clamy, 2014/09/18 20:50:39]

We need some of this state when the navigation is ready to commit (eg page_id).
This is coming from the NavigationEntry. Since we discussed in the previous CL
that we can't depend on the pending_navigation_entry, I don't have that much
choice apart from storing the information when I get it (that is
RequestNavigation). However, I think the new format of structs allow for less of
it to be stored.

+
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_