| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 7dd28607bc8e79bfcf586d05375299affca118a7..0dbf386d88def2249c4c9ca407b72ced8a8e1a00 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -35,6 +35,7 @@
|
|
|
| class TransportDIB;
|
| struct FrameMsg_Navigate_Params;
|
| +struct FrameMsg_NewFrame_WidgetParams;
|
|
|
| namespace blink {
|
| class WebGeolocationClient;
|
| @@ -101,7 +102,9 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // Note: This is called only when RenderFrame is being created in response to
|
| // IPC message from the browser process. All other frame creation is driven
|
| // through Blink and Create.
|
| - static void CreateFrame(int routing_id, int parent_routing_id);
|
| + static void CreateFrame(int routing_id,
|
| + int parent_routing_id,
|
| + const FrameMsg_NewFrame_WidgetParams& params);
|
|
|
| // Returns the RenderFrameImpl for the given routing ID.
|
| static RenderFrameImpl* FromRoutingID(int routing_id);
|
| @@ -645,6 +648,13 @@ class CONTENT_EXPORT RenderFrameImpl
|
| RenderFrameProxy* render_frame_proxy_;
|
| bool is_detaching_;
|
|
|
| + // Used when the RenderFrame is a local frame root; for now RenderWidgets are
|
| + // added only when a child frame is in a different process from its parent
|
| + // frame, but eventually this will also apply to top-level frames.
|
| + // FIXME(kenrb): Correct the above statement when top-level frames have their
|
| + // own RenderWidgets.
|
| + scoped_refptr<RenderWidget> render_widget_;
|
| +
|
| #if defined(ENABLE_PLUGINS)
|
| // Current text input composition text. Empty if no composition is in
|
| // progress.
|
|
|