Start using RenderFrameProxyHost objects.

content/renderer/render_frame_proxy.h

 // Copyright 2014 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_RENDERER_RENDER_FRAME_PROXY_H_
 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
@@ skipping 30 matching lines @@
 // finished executing. It will still be responsible for routing IPC messages
 // which are valid for cross-site interactions between frames.
 // RenderFrameProxy will be deleted when the node in the frame tree is deleted
 // or when navigating the frame causes it to return to this process and a new
 // RenderFrame is created for it.
 class CONTENT_EXPORT RenderFrameProxy
     : public IPC::Listener,
       public IPC::Sender,
       NON_EXPORTED_BASE(public blink::WebFrameClient) {
  public:
+  // This method should be used to create a RenderFrameProxy, which will replace
+  // an existing RenderFrame during its cross-process navigation from the
+  // current process to a different one.
+  static RenderFrameProxy* CreateProxyForFrame(int routing_id,
+                                               int frame_routing_id);
+
+  // This method should be used to create a RenderFrameProxy, when there isn't
+  // an existing RenderFrame. It happens when some other frame in the frame tree
+  // of the document is navigating cross-process and a proxy for the new frame
+  // is needed.
   static RenderFrameProxy* CreateFrameProxy(int routing_id,
-                                            int frame_routing_id);
+                                            int parent_routing_id,
+                                            int render_view_routing_id);
 
   // Returns the RenderFrameProxy for the given routing ID.
   static RenderFrameProxy* FromRoutingID(int routing_id);
 
+  // Returns the RenderFrameProxy given a WebFrame.
+  static RenderFrameProxy* FromWebFrame(blink::WebFrame* web_frame);
+
   virtual ~RenderFrameProxy();
 
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
+  int routing_id() {
+    return routing_id_;
+  }
+
   RenderFrameImpl* render_frame() {
     return render_frame_;
   }
 
   // Out-of-process child frames receive a signal from RenderWidgetCompositor
   // when a compositor frame has committed.
   void DidCommitCompositorFrame();
 
+  RenderViewImpl* render_view() {
+    return render_view_;
+  }
+
+  blink::WebRemoteFrame* GetWebFrame() {
+    return frame_;
+  }
+
  private:
   RenderFrameProxy(int routing_id, int frame_routing_id);
 
   // IPC::Listener
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // IPC handlers
   void OnDeleteProxy();
   void OnChildFrameProcessGone();
   void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params);
   void OnCompositorFrameSwapped(const IPC::Message& message);
 
-  blink::WebFrame* GetWebFrame();
+  void set_render_view(RenderViewImpl* render_view) {
+    render_view_ = render_view;
+  }
 
   int routing_id_;
   int frame_routing_id_;
   RenderFrameImpl* render_frame_;
+  blink::WebRemoteFrame* frame_;
+  scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
 
-  scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
+  RenderViewImpl* render_view_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
 };
 
 }  // namespace
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_