Allow RenderFrames to swap out for subframe navigations.

content/renderer/render_frame_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_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 28 matching lines @@
 class RenderViewImpl;
 class RenderWidget;
 class RenderWidgetFullscreenPepper;
 
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient) {
  public:
   // Creates a new RenderFrame. |render_view| is the RenderView object that this
   // frame belongs to.
+  // Callers *must* call |SetWebFrame| immediately after creation.
+  // TODO(creis): We should structure this so that |SetWebFrame| isn't needed.
   static RenderFrameImpl* Create(RenderViewImpl* render_view, int32 routing_id);
 
+  // For subframes, look up the RenderFrameImpl for the given WebFrame.  Returns
+  // NULL for main frames.
+  // This only works when using --site-per-process, and returns NULL otherwise.
+  // TODO(creis): Remove this when the RenderView methods dealing with frames
+  // have moved to RenderFrame.
+  static RenderFrameImpl* FindByWebFrame(blink::WebFrame* web_frame);
+
   // Used by content_layouttest_support to hook into the creation of
   // RenderFrameImpls.
   static void InstallCreateHook(
       RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32));
 
   virtual ~RenderFrameImpl();
 
+  bool is_swapped_out() const {
+    return is_swapped_out_;
+  }
+
   // TODO(jam): this is a temporary getter until all the code is transitioned
   // to using RenderFrame instead of RenderView.
   RenderViewImpl* render_view() { return render_view_; }
 
   // Returns the RenderWidget associated with this frame.
   RenderWidget* GetRenderWidget();
 
   // Called by RenderView right after creating this object when the
   // blink::WebFrame has been created.
   void MainWebFrameCreated(blink::WebFrame* frame);
 
+  // In --site-per-process mode, we keep track of which WebFrame this
+  // RenderFrameImpl is for.
+  void SetWebFrame(blink::WebFrame* web_frame);

[nasko, 2013/12/20 22:59:51]

nit: Since this is not in the public interface, it should be hacker_style, no?

[Charlie Reis, 2013/12/21 00:26:42]

No, only one-liners that can be inlined should be hacker_style:

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Functi...

+
 #if defined(ENABLE_PLUGINS)
   // Notification that a PPAPI plugin has been created.
   void PepperPluginCreated(RendererPpapiHost* host);
 
   // Indicates that the given instance has been created.
   void PepperInstanceCreated(PepperPluginInstanceImpl* instance);
 
   // Indicates that the given instance is being destroyed. This is called from
   // the destructor, so it's important that the instance is not dereferenced
   // from this call.
@@ skipping 239 matching lines @@
  protected:
   RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
 
  private:
   friend class RenderFrameObserver;
 
   // Functions to add and remove observers for this object.
   void AddObserver(RenderFrameObserver* observer);
   void RemoveObserver(RenderFrameObserver* observer);
 
+  // IPC message handlers ------------------------------------------------------
+  //
+  // The documentation for these functions should be in
+  // content/common/*_messages.h for the message that the function is handling.
+  void OnSwapOut();
+
+  // In --site-per-process mode, stores the WebFrame we are associated with.

[nasko, 2013/12/20 22:59:51]

nit: I think when we remove the flag requirement for RF per core::Frame, we will
always have the WebFrame pointer stored, so the comment might not be needed.

[Charlie Reis, 2013/12/21 00:26:42]

Good thought, but let's remove the comment when that change lands.  For the
moment, this CL doesn't depend on having a RenderFrame per frame and could land
first.

+  // NULL otherwise.
+  blink::WebFrame* frame_;
+
   RenderViewImpl* render_view_;
   int routing_id_;
   bool is_swapped_out_;
   bool is_detaching_;
 
 #if defined(ENABLE_PLUGINS)
   typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
   PepperPluginSet active_pepper_instances_;
 
   // Current text input composition text. Empty if no composition is in
   // progress.
   base::string16 pepper_composition_text_;
 #endif
 
   // All the registered observers.
   ObserverList<RenderFrameObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_