Decouple RVH creation from CrossProcessFrameConnector.

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 39 matching lines @@
   //
   // There is additional complexity that some of the functions we need in
   // WebContentsImpl are inherited and non-virtual. These are named with
   // "RenderManager" so that the duplicate implementation of them will be clear.
   class CONTENT_EXPORT Delegate {
    public:
     // Initializes the given renderer if necessary and creates the view ID
     // corresponding to this view host. If this method is not called and the
     // 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.
+    // automatically called from LoadURL. |main_frame| indicates whether this

[Charlie Reis, 2014/05/16 17:04:06]

This comment doesn't quite make sense, because a RenderViewHost can be used for
both a main frame and a subframe during its lifetime.  I think we want to say it
indicates whether |render_view_host| is being created for a main frame.

[nasko, 2014/05/16 17:26:02]

At this point in time, I don't think RVH can be reused for both main frame and
subframes. We need to tackle this, but I'm guessing it will come as we make
RenderWidgetHost be owned by RFH and no longer needing the RVH for the widget
part of it.

+    // RenderViewHost is used to render a top-level frame or subframe, so the

[Charlie Reis, 2014/05/16 17:04:06]

nit: drop "or subframe"

[nasko, 2014/05/16 17:26:02]

Done.

+    // appropriate RenderWidgetHostView type is used.
     //
     // If you are attaching to an already-existing RenderView, you should call
     // InitWithExistingID.
     virtual bool CreateRenderViewForRenderManager(
         RenderViewHost* render_view_host,
         int opener_route_id,
-        CrossProcessFrameConnector* cross_process_frame_connector) = 0;
+        bool main_frame) = 0;

[Charlie Reis, 2014/05/16 17:04:06]

nit: for_main_frame
(for the same reason mentioned above)

[nasko, 2014/05/16 17:26:02]

Done.

     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(
         RenderViewHost* old_host, RenderViewHost* new_host) = 0;
     virtual NavigationControllerImpl&
@@ skipping 292 matching lines @@
                                                         int view_routing_id,
                                                         int frame_routing_id,
                                                         bool swapped_out,
                                                         bool hidden);
 
   // Sets up the necessary state for a new RenderViewHost with the given opener,
   // if necessary.  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);
+  bool InitRenderView(RenderViewHost* render_view_host,
+                      int opener_route_id,
+                      bool main_frame);

[Charlie Reis, 2014/05/16 17:04:06]

nit: for_main_frame

[nasko, 2014/05/16 17:26:02]

Done.

 
   // 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);
@@ skipping 83 matching lines @@
   CrossProcessFrameConnector* cross_process_frame_connector_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_