Android WebView Merged-Thread Hardware Draw

content/renderer/android/synchronous_compositor_output_surface.h

Index: content/renderer/android/synchronous_compositor_output_surface.h
diff --git a/content/renderer/android/synchronous_compositor_output_surface.h b/content/renderer/android/synchronous_compositor_output_surface.h
index 04af44fd1184fee26ef63b838cb39d1d0b05c804..22435390989d1b0dad9bad347a1b70e2fffc353f 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.h
+++ b/content/renderer/android/synchronous_compositor_output_surface.h
@@ -28,25 +28,29 @@ class SynchronousCompositorOutputSurface
     : NON_EXPORTED_BASE(public cc::OutputSurface),
       NON_EXPORTED_BASE(public SynchronousCompositor) {
  public:
-  SynchronousCompositorOutputSurface(
-      int32 routing_id,
-      WebGraphicsContext3DCommandBufferImpl* context);
+  explicit SynchronousCompositorOutputSurface(int32 routing_id);
   virtual ~SynchronousCompositorOutputSurface();
 
   // OutputSurface.
   virtual bool BindToClient(cc::OutputSurfaceClient* surface_client) OVERRIDE;
+  virtual void Reshape(gfx::Size size) OVERRIDE;
   virtual void SendFrameToParentCompositor(cc::CompositorFrame* frame) OVERRIDE;
+  virtual void EnableVSyncNotification(bool enable_vsync) OVERRIDE;
+  virtual void SwapBuffers(const cc::LatencyInfo& info) OVERRIDE;
 
   // SynchronousCompositor.
   virtual void SetClient(SynchronousCompositorClient* compositor_client)
       OVERRIDE;
   virtual bool DemandDrawSw(SkCanvas* canvas) OVERRIDE;
+  virtual void DemandDrawHw(gfx::Rect damage_rect) OVERRIDE;
 
  private:
+  void UpdateCompositorClientSettings();
   bool CalledOnValidThread() const;
 
   SynchronousCompositorClient* compositor_client_;
   int routing_id_;
+  bool vsync_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };