Chromium Code Reviews| Index: content/renderer/render_widget.h |
| diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h |
| index 72a5800f4f7ebaf10713cf390164da997aaee3c0..ae04c517cf681a0e41ce8be043e5e3aca9774455 100644 |
| --- a/content/renderer/render_widget.h |
| +++ b/content/renderer/render_widget.h |
| @@ -52,7 +52,10 @@ struct WebPoint; |
| struct WebRenderingStatsImpl; |
| } |
| -namespace cc { class OutputSurface; } |
| +namespace cc { |
| +class InputHandlerClient; |
| +class OutputSurface; |
| +} |
| namespace ui { |
| class Range; |
| @@ -72,6 +75,7 @@ namespace content { |
| struct GpuRenderingStats; |
| class RenderWidgetCompositor; |
| class RenderWidgetTest; |
| +class SynchronousCompositorImpl; |
| // RenderWidget provides a communication bridge between a WebWidget and |
| // a RenderWidgetHost, the latter of which lives in a different process. |
| @@ -174,6 +178,7 @@ class CONTENT_EXPORT RenderWidget |
| RenderWidgetCompositor* compositor() const; |
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(); |
| + scoped_ptr<cc::InputHandlerClient> CreateInputHandlerClient(); |
| // Callback for use with BeginSmoothScroll. |
| typedef base::Callback<void()> SmoothScrollCompletionCallback; |
| @@ -489,6 +494,9 @@ class CONTENT_EXPORT RenderWidget |
| WebGraphicsContext3DCommandBufferImpl* CreateGraphicsContext3D( |
| const WebKit::WebGraphicsContext3D::Attributes& attributes); |
| + // Lazily creates the synchronous compositor on first call. |
| + SynchronousCompositorImpl* GetSynchronousCompositor(); |
| + |
| bool OnSnapshotHelper(const gfx::Rect& src_subrect, SkBitmap* bitmap); |
| // Routing ID that allows us to communicate to the parent browser process |
| @@ -503,6 +511,9 @@ class CONTENT_EXPORT RenderWidget |
| // This is lazily constructed and must not outlive webwidget_. |
| scoped_ptr<RenderWidgetCompositor> compositor_; |
| + // This is lazily constructed. |
| + scoped_ptr<SynchronousCompositorImpl> synchronous_compositor_; |
|
joth
2013/05/16 18:21:42
could be #if ANDROID .. ?
|
| + |
| // Set to the ID of the view that initiated creating this view, if any. When |
| // the view was initiated by the browser (the common case), this will be |
| // MSG_ROUTING_NONE. This is used in determining ownership when opening |