Now that RenderFrame is 1:1 with WebFrame, add the associated getters and start cleaning up assumpt…

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 <vector>
 
 #include "base/basictypes.h"
@@ skipping 32 matching lines @@
 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);
+  // Just like RenderFrame::FromWebFrame but returns the implementation.
+  static RenderFrameImpl* FromWebFrame(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();
   // TODO(nasko): Remove when no longer needed.
   // See comment on the implementation of this method for more details.
   void operator delete(void*);
 
   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_; }
 
   RendererWebCookieJarImpl* cookie_jar() { return &cookie_jar_; }
 
   // 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.
+  // This is called right after creation with the WebFrame for this RenderFrame.
   void SetWebFrame(blink::WebFrame* web_frame);
 
 #if defined(ENABLE_PLUGINS)
   // Notification that a PPAPI plugin has been created.
   void PepperPluginCreated(RendererPpapiHost* host);
 
   // Notifies that |instance| has changed the cursor.
   // This will update the cursor appearance if it is currently over the plugin
   // instance.
   void PepperDidChangeCursor(PepperPluginInstanceImpl* instance,
@@ skipping 46 matching lines @@
 
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // IPC::Listener
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // RenderFrame implementation:
   virtual RenderView* GetRenderView() OVERRIDE;
   virtual int GetRoutingID() OVERRIDE;
+  virtual blink::WebFrame* GetWebFrame() OVERRIDE;
   virtual WebPreferences& GetWebkitPreferences() OVERRIDE;
   virtual int ShowContextMenu(ContextMenuClient* client,
                               const ContextMenuParams& params) OVERRIDE;
   virtual void CancelContextMenu(int request_id) OVERRIDE;
   virtual blink::WebPlugin* CreatePlugin(
       blink::WebFrame* frame,
       const WebPluginInfo& info,
       const blink::WebPluginParams& params) OVERRIDE;
   virtual void LoadURLExternally(
       blink::WebFrame* frame,
@@ skipping 155 matching lines @@
   // 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.
-  // NULL otherwise.
+  // Stores the WebFrame we are associated with.
   blink::WebFrame* frame_;
 
   RenderViewImpl* render_view_;
   int routing_id_;
   bool is_swapped_out_;
   bool is_detaching_;
 
 #if defined(ENABLE_PLUGINS)
   // Current text input composition text. Empty if no composition is in
   // progress.
   base::string16 pepper_composition_text_;
 #endif
 
   RendererWebCookieJarImpl cookie_jar_;
 
   // All the registered observers.
   ObserverList<RenderFrameObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_