| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 31ab4d237001cc0a82edaa3796487a60585eb036..e17bc384f216214d680806f2510cf95a1359cda3 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -36,6 +36,7 @@
|
| class GURL;
|
| class TransportDIB;
|
| struct FrameMsg_Navigate_Params;
|
| +struct FrameMsg_NewFrame_WidgetParams;
|
|
|
| namespace blink {
|
| class WebGeolocationClient;
|
| @@ -105,7 +106,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);
|
| @@ -648,6 +651,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.
|
|
|