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

content/public/renderer/render_frame.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_PUBLIC_RENDERER_RENDER_FRAME_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_
 
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
@@ skipping 13 matching lines @@
 class RenderView;
 struct ContextMenuParams;
 struct WebPluginInfo;
 
 // This interface wraps functionality, which is specific to frames, such as
 // navigation. It provides communication with a corresponding RenderFrameHost
 // in the browser process.
 class CONTENT_EXPORT RenderFrame : public IPC::Listener,
                                    public IPC::Sender {
  public:
+  // Returns the RenderFrame given a WebFrame.
+  static RenderFrame* FromWebFrame(blink::WebFrame* web_frame);
+
   // Returns the RenderView associated with this frame.
   virtual RenderView* GetRenderView() = 0;
 
   // Get the routing ID of the frame.
   virtual int GetRoutingID() = 0;
 
+  // Returns the associated WebFrame.
+  virtual blink::WebFrame* GetWebFrame() = 0;
+
    // Gets WebKit related preferences associated with this frame.
   virtual WebPreferences& GetWebkitPreferences() = 0;
 
   // Shows a context menu with the given information. The given client will
   // be called with the result.
   //
   // The request ID will be returned by this function. This is passed to the
   // client functions for identification.
   //
   // If the client is destroyed, CancelContextMenu() should be called with the
@@ skipping 26 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class RenderFrameImpl;
   RenderFrame() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_