Start using RenderFrameProxyHost objects.

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 13 matching lines @@
 class CrossProcessFrameConnector;
 class CrossSiteTransferringRequest;
 class InterstitialPageImpl;
 class FrameTreeNode;
 class NavigationControllerImpl;
 class NavigationEntry;
 class NavigationEntryImpl;
 class NavigationRequest;
 class RenderFrameHost;
 class RenderFrameHostDelegate;
+class RenderFrameHost;
 class RenderFrameHostImpl;
 class RenderFrameHostManagerTest;
 class RenderFrameProxyHost;
 class RenderViewHost;
 class RenderViewHostImpl;
 class RenderWidgetHostDelegate;
 class RenderWidgetHostView;
 class TestWebContents;
 class WebUIImpl;
 
@@ skipping 17 matching lines @@
     // process is not shared, then the WebContentsImpl will act as though the
     // renderer is not running (i.e., it will render "sad tab"). This method is
     // automatically called from LoadURL. |for_main_frame| indicates whether
     // this RenderViewHost is used to render a top-level frame, so the
     // appropriate RenderWidgetHostView type is used.
     virtual bool CreateRenderViewForRenderManager(
         RenderViewHost* render_view_host,
         int opener_route_id,
         int proxy_routing_id,
         bool for_main_frame) = 0;
+    virtual bool CreateRenderFrameForRenderManager(
+        RenderFrameHost* render_frame_host,
+        int parent_routing_id) = 0;
     virtual void BeforeUnloadFiredFromRenderManager(
         bool proceed, const base::TimeTicks& proceed_time,
         bool* proceed_to_fire_unload) = 0;
     virtual void RenderProcessGoneFromRenderManager(
         RenderViewHost* render_view_host) = 0;
     virtual void UpdateRenderViewSizeForRenderManager() = 0;
     virtual void CancelModalDialogsForRenderManager() = 0;
     virtual void NotifySwappedFromRenderManager(RenderFrameHost* old_host,
                                                 RenderFrameHost* new_host,
                                                 bool is_main_frame) = 0;
@@ skipping 163 matching lines @@
   // Called when a renderer sets its opener to null.
   void DidDisownOpener(RenderViewHost* render_view_host);
 
   // Helper method to create and initialize a RenderFrameHost.  If |swapped_out|
   // is true, it will be initially placed on the swapped out hosts list.
   // Otherwise, it will be used for a pending cross-site navigation.
   // Returns the routing id of the *view* associated with the frame.
   int CreateRenderFrame(SiteInstance* instance,
                         int opener_route_id,
                         bool swapped_out,
+                        bool for_main_frame,
                         bool hidden);
 
+  // Helper method to create and initialize a RenderFrameProxyHost.

[Charlie Reis, 2014/07/24 22:36:30]

Please say what this returns.

[kenrb, 2014/07/25 23:42:05]

Done.

+  int CreateRenderFrameProxy(SiteInstance* instance);
+
   // Sets the passed passed interstitial as the currently showing interstitial.
   // |interstitial_page| should be non NULL (use the remove_interstitial_page
   // method to unset the interstitial) and no interstitial page should be set
   // when there is already a non NULL interstitial page set.
   void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
     DCHECK(!interstitial_page_ && interstitial_page);
     interstitial_page_ = interstitial_page;
   }
 
   // Unsets the currently showing interstitial.
@@ skipping 32 matching lines @@
   void ClearPendingShutdownRFHForSiteInstance(int32 site_instance_id,
                                               RenderFrameHostImpl* rfh);
 
   // Deletes any proxy hosts associated with this node. Used during destruction
   // of WebContentsImpl.
   void ResetProxyHosts();
 
   // Used to start a navigation, part of browser-side navigation project.
   void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params);
 
+  int GetRoutingIdForSiteInstance(SiteInstance* site_instance);

[Charlie Reis, 2014/07/24 22:36:30]

This name is confusing, since routing IDs are used for many things but
SiteInstances don't have them.  Is it for the RenderFrameHost with the given
SiteInstance in this RenderFrameHostManager?  What does it return if there is
none?

Let's add a comment and maybe change the name to something like
GetFrameRoutingIdForSiteInstance.

[nasko, 2014/07/25 07:13:20]

It is scoped to RFHM and is supposed to return the routing id of either RFH or
RFPH, which is associated with |site_instance|. This method is used to find out
the routing id for the parent object to send for creation IPCs. The reason I
didn't add Frame to the name is that the parent might be in a different process,
at which point there will exist a proxy for the SiteInstance of the object we
are creating, not a frame.

[kenrb, 2014/07/25 23:42:05]

I have added a comment but left the name the same.

[Charlie Reis, 2014/07/28 19:24:28]

Acknowledged.

+
  private:
   friend class RenderFrameHostManagerTest;
   friend class TestWebContents;
 
+  FRIEND_TEST_ALL_PREFIXES(CrossProcessFrameTreeBrowserTest,
+                           VerifyProxyCreation);
+
   // Tracks information about a navigation while a cross-process transition is
   // in progress, in case we need to transfer it to a new RenderFrameHost.
   // When a request is being transferred, deleting the PendingNavigationParams,
   // and thus |cross_site_transferring_request|, will cancel the request being
   // transferred, unless its ReleaseRequest method has been called.
   struct PendingNavigationParams {
     PendingNavigationParams(
         const GlobalRequestID& global_request_id,
         scoped_ptr<CrossSiteTransferringRequest>
             cross_site_transferring_request,
@@ skipping 84 matching lines @@
   // with the given |proxy_routing_id|, which is used to route IPC messages when
   // in swapped out state.  Returns early if the RenderViewHost has already been
   // initialized for another RenderFrameHost.
   // TODO(creis): opener_route_id is currently for the RenderViewHost but should
   // be for the RenderFrame, since frames can have openers.
   bool InitRenderView(RenderViewHost* render_view_host,
                       int opener_route_id,
                       int proxy_routing_id,
                       bool for_main_frame);
 
+  bool InitRenderFrame(RenderFrameHost* render_frame_host);

[Charlie Reis, 2014/07/24 22:36:30]

This needs a comment.  Is the behavior similar to InitRenderView above?

[nasko, 2014/07/25 07:13:20]

Yes, it is. In general, I've made RFH/RFPH creation mimick how RVHs are created.
Similarly named methods should behave similarly.

[kenrb, 2014/07/25 23:42:05]

I have added a short comment. Let me know if you want something different.

+
   // Sets the pending RenderFrameHost/WebUI to be the active one. Note that this
   // doesn't require the pending render_frame_host_ pointer to be non-NULL,
   // since there could be Web UI switching as well. Call this for every commit.
   void CommitPending();
 
-  // Shutdown all RenderFrameHosts in a SiteInstance. This is called to shutdown
-  // frames when all the frames in a SiteInstance are confirmed to be swapped
-  // out.
-  void ShutdownRenderFrameHostsInSiteInstance(int32 site_instance_id);
+  // Shutdown all RenderFrameProxyHosts in a SiteInstance. This is called to
+  // shutdown frames when all the frames in a SiteInstance are confirmed to be
+  // swapped out.

[Charlie Reis, 2014/07/24 22:36:30]

Nice!  We're getting closer to where we won't have RenderFrameHosts that are
swapped out.

+  void ShutdownRenderFrameProxyHostsInSiteInstance(int32 site_instance_id);
 
   // Helper method to terminate the pending RenderViewHost.
   void CancelPending();
 
   // Helper method to set the active RenderFrameHost. Returns the old
   // RenderFrameHost and updates counts.
   scoped_ptr<RenderFrameHostImpl> SetRenderFrameHost(
       scoped_ptr<RenderFrameHostImpl> render_frame_host);
 
   RenderFrameHostImpl* UpdateStateForNavigate(
@@ skipping 73 matching lines @@
   scoped_ptr<NavigationRequest> navigation_request_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_