Create RenderFrameProxyHost at time of swap-out instead of commit.

content/browser/frame_host/render_frame_host_impl.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_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 18 matching lines @@
 class ListValue;
 }
 
 namespace content {
 
 class CrossProcessFrameConnector;
 class CrossSiteTransferringRequest;
 class FrameTree;
 class FrameTreeNode;
 class RenderFrameHostDelegate;
+class RenderFrameProxyHost;
 class RenderProcessHost;
 class RenderViewHostImpl;
 struct ContextMenuParams;
 struct GlobalRequestID;
 struct Referrer;
 struct ShowDesktopNotificationHostMsgParams;
 
 class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
  public:
   static RenderFrameHostImpl* FromID(int process_id, int routing_id);
@@ skipping 36 matching lines @@
   // |cross_process_frame_connector| allows the non-swapped-out
   // RenderFrameHost for a frame to communicate with the parent process
   // so that it may composite drawing data.
   //
   // Ownership is not transfered.
   void set_cross_process_frame_connector(
       CrossProcessFrameConnector* cross_process_frame_connector) {
     cross_process_frame_connector_ = cross_process_frame_connector;
   }
 
+  void set_render_frame_proxy(RenderFrameProxyHost* proxy) {

[Charlie Reis, 2014/05/15 00:32:50]

nit: set_render_frame_proxy_host

[nasko, 2014/05/15 18:47:13]

Done.

+    render_frame_proxy_ = proxy;
+  }
+
   // Returns a bitwise OR of bindings types that have been enabled for this
   // RenderFrameHostImpl's RenderView. See BindingsPolicy for details.
   // TODO(creis): Make bindings frame-specific, to support cases like <webview>.
   int GetEnabledBindings();
 
   // Called on the pending RenderFrameHost when the network response is ready to
   // commit.  We should ensure that the old RenderFrameHost runs its unload
   // handler and determine whether a transfer to a different RenderFrameHost is
   // needed.
   void OnCrossSiteResponse(
       const GlobalRequestID& global_request_id,
       scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request,
       const std::vector<GURL>& transfer_url_chain,
       const Referrer& referrer,
       PageTransition page_transition,
       bool should_replace_current_entry);
 
   // Tells the renderer that this RenderFrame is being swapped out for one in a
   // different renderer process.  It should run its unload handler and move to
   // a blank document.  The renderer should preserve the Frame object until it
   // exits, in case we come back.  The renderer can exit if it has no other
   // active RenderFrames, but not until WasSwappedOut is called (when it is no
   // longer visible).
-  void SwapOut();
+  void SwapOut(RenderFrameProxyHost* proxy);

[Charlie Reis, 2014/05/15 00:32:50]

Can you mention what |proxy| is for in the comment, and whether we expect its
corresponding RenderFrameProxy to exist in the renderer at the time this is
called?

[nasko, 2014/05/15 18:47:13]

Done.

 
   void OnSwappedOut(bool timed_out);
   bool is_swapped_out() { return is_swapped_out_; }
   void set_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
   }
 
   // Sets the RVH for |this| as pending shutdown. |on_swap_out| will be called
   // when the SwapOutACK is received.
   void SetPendingShutdown(const base::Closure& on_swap_out);
@@ skipping 125 matching lines @@
   //
   // This is only non-NULL when this is the swapped out RenderFrameHost in
   // the same site instance as this frame's parent.
   //
   // See the class comment above CrossProcessFrameConnector for more
   // information.
   //
   // This will move to RenderFrameProxyHost when that class is created.
   CrossProcessFrameConnector* cross_process_frame_connector_;
 
+  // The proxy created for this RenderFrameHost. It is used to send and receive
+  // IPC messages while in swapped out state.
+  // TODO(nasko): This can be removed once we don't use swapping out of

[Charlie Reis, 2014/05/15 00:32:50]

There are a lot of comments like this, but the wording doesn't feel right to me.
 We should instead say something like "...once we don't have a swapped out state
on RenderFrameHosts," and cite http://crbug.com/357747.  Can you update the
others as well?

[nasko, 2014/05/15 18:47:13]

Done.

+  // RenderFrameHost objects.
+  RenderFrameProxyHost* render_frame_proxy_;

[Charlie Reis, 2014/05/15 00:32:50]

nit: render_frame_proxy_host_

That's more consistent with mentioning "host" in render_view_host_, and it's a
bit clearer to others trying to understand which object lives where.

[nasko, 2014/05/15 18:47:13]

Done.

+
   // Reference to the whole frame tree that this RenderFrameHost belongs to.
   // Allows this RenderFrameHost to add and remove nodes in response to
   // messages from the renderer requesting DOM manipulation.
   FrameTree* frame_tree_;
 
   // The FrameTreeNode which this RenderFrameHostImpl is hosted in.
   FrameTreeNode* frame_tree_node_;
 
   // The mapping of pending JavaScript calls created by
   // ExecuteJavaScript and their corresponding callbacks.
   std::map<int, JavaScriptResultCallback> javascript_callbacks_;
 
   // Map from notification_id to a callback to cancel them.
   std::map<int, base::Closure> cancel_notification_callbacks_;
 
   int routing_id_;
   bool is_swapped_out_;
 
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;
 
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_