Refactor SynchronousCompositor out of SynchronousCompositorOutputSurface.

content/renderer/render_widget.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 35 matching lines @@
 
 namespace WebKit {
 class WebGestureEvent;
 class WebInputEvent;
 class WebMouseEvent;
 class WebTouchEvent;
 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;
 }
 
 namespace webkit {
 namespace npapi {
 struct WebPluginGeometry;
 }  // namespace npapi
 
 namespace ppapi {
 class PluginInstance;
 }  // namespace ppapi
 }  // namespace webkit
 
 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.
 class CONTENT_EXPORT RenderWidget
     : public IPC::Listener,
       public IPC::Sender,
       NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient),
       NON_EXPORTED_BASE(public WebGraphicsContext3DSwapBuffersClient),
       public base::RefCounted<RenderWidget> {
  public:
@@ skipping 406 matching lines @@
   // at the given point.
   virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const;
 
   // Check whether the WebWidget has any touch event handlers registered.
   virtual void hasTouchEventHandlers(bool has_handlers);
 
   // Creates a 3D context associated with this view.
   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
   // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
   int32 routing_id_;
 
   int32 surface_id_;
 
   // We are responsible for destroying this object via its Close method.
   WebKit::WebWidget* webwidget_;
 
   // 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
   // child tabs. See RenderWidget::createWebViewWithRequest.
   //
   // This ID may refer to an invalid view if that view is closed before this
   // view is.
   int32 opener_id_;
 
   // The position where this view should be initially shown.
@@ skipping 187 matching lines @@
   bool overscroll_notifications_enabled_;
 
   base::WeakPtrFactory<RenderWidget> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_