Refactor SynchronousCompositor out of SynchronousCompositorOutputSurface.

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index bfe776ebf677cc40630129a11a7a1e9820e04b37..9b84de86263ed2444ac9d219c0b9425d2af0472b 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -53,7 +53,10 @@ struct WebPoint;
 struct WebRenderingStatsImpl;
 }
 
-namespace cc { class OutputSurface; }
+namespace cc {
+class InputHandlerClient;

[jamesr, 2013/05/29 23:00:50]

this doesn't appear to be used, please revert

[joth, 2013/05/29 23:42:56]

Done.

+class OutputSurface;
+}
 
 namespace ui {
 class Range;
@@ -73,6 +76,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.
@@ -499,6 +503,11 @@ class CONTENT_EXPORT RenderWidget
   WebGraphicsContext3DCommandBufferImpl* CreateGraphicsContext3D(
       const WebKit::WebGraphicsContext3D::Attributes& attributes);
 
+#if defined(OS_ANDROID)
+  // Lazily creates the synchronous compositor on first call.
+  SynchronousCompositorImpl* GetSynchronousCompositor();
+#endif
+
   bool OnSnapshotHelper(const gfx::Rect& src_subrect, SkBitmap* bitmap);
 
   // Routing ID that allows us to communicate to the parent browser process
@@ -513,6 +522,11 @@ class CONTENT_EXPORT RenderWidget
   // This is lazily constructed and must not outlive webwidget_.
   scoped_ptr<RenderWidgetCompositor> compositor_;
 
+#if defined(OS_ANDROID)
+  // This is lazily constructed.
+  scoped_ptr<SynchronousCompositorImpl> synchronous_compositor_;
+#endif
+
   // 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