| Index: content/renderer/render_widget.h
|
| diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
|
| index 883cd066a61e1e20659b827f657b07bef23463bb..c58a2e1a3527caf8affaf60ec01449845400bc92 100644
|
| --- a/content/renderer/render_widget.h
|
| +++ b/content/renderer/render_widget.h
|
| @@ -70,6 +70,7 @@ class Range;
|
| }
|
|
|
| namespace content {
|
| +class CompositorDependencies;
|
| class ExternalPopupMenu;
|
| class FrameSwapMessageQueue;
|
| class PepperPluginInstanceImpl;
|
| @@ -92,6 +93,7 @@ class CONTENT_EXPORT RenderWidget
|
| // Creates a new RenderWidget. The opener_id is the routing ID of the
|
| // RenderView that this widget lives inside.
|
| static RenderWidget* Create(int32 opener_id,
|
| + CompositorDependencies* compositor_deps,
|
| blink::WebPopupType popup_type,
|
| const blink::WebScreenInfo& screen_info);
|
|
|
| @@ -100,6 +102,7 @@ class CONTENT_EXPORT RenderWidget
|
|
|
| int32 routing_id() const { return routing_id_; }
|
| int32 surface_id() const { return surface_id_; }
|
| + CompositorDependencies* compositor_deps() const { return compositor_deps_; }
|
| blink::WebWidget* webwidget() const { return webwidget_; }
|
| gfx::Size size() const { return size_; }
|
| bool has_focus() const { return has_focus_; }
|
| @@ -326,10 +329,11 @@ class CONTENT_EXPORT RenderWidget
|
|
|
| // Initializes this view with the given opener. CompleteInit must be called
|
| // later.
|
| - bool Init(int32 opener_id);
|
| + bool Init(int32 opener_id, CompositorDependencies* compositor_deps);
|
|
|
| // Called by Init and subclasses to perform initialization.
|
| bool DoInit(int32 opener_id,
|
| + CompositorDependencies* compositor_deps,
|
| blink::WebWidget* web_widget,
|
| IPC::SyncMessage* create_widget_message);
|
|
|
| @@ -555,6 +559,10 @@ class CONTENT_EXPORT RenderWidget
|
|
|
| int32 surface_id_;
|
|
|
| + // Dependencies for initializing a compositor, including flags for optional
|
| + // features.
|
| + CompositorDependencies* compositor_deps_;
|
| +
|
| // We are responsible for destroying this object via its Close method.
|
| // May be NULL when the window is closing.
|
| blink::WebWidget* webwidget_;
|
|
|