aw: Ubercomp mega patch

content/browser/android/in_process/synchronous_compositor_impl.h

Index: content/browser/android/in_process/synchronous_compositor_impl.h
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h
index df6f3d2e99a9cebca2669d9bb4ce4b44199471de..e02f1f2eab028c908248bb9e79e8a0ca447e7f7c 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_impl.h
@@ -51,13 +51,20 @@ class SynchronousCompositorImpl
   virtual bool InitializeHwDraw(
       scoped_refptr<gfx::GLSurface> surface) OVERRIDE;
   virtual void ReleaseHwDraw() OVERRIDE;
-  virtual bool DemandDrawHw(
-      gfx::Size surface_size,
-      const gfx::Transform& transform,
-      gfx::Rect viewport,
-      gfx::Rect clip,
-      bool stencil_enabled) OVERRIDE;
-  virtual bool DemandDrawSw(SkCanvas* canvas) OVERRIDE;
+  virtual bool DemandDrawHw(gfx::Size surface_size,
+                            const gfx::Transform& transform,
+                            gfx::Rect viewport,
+                            gfx::Rect clip,
+                            bool stencil_enabled,
+                            cc::CompositorFrame* frame) OVERRIDE;
+  virtual bool DemandDrawDelegated(const gfx::Transform& transform,
+                                   gfx::Rect viewport,
+                                   gfx::Rect clip,
+                                   cc::CompositorFrame* frame) OVERRIDE;
+  virtual bool DemandDrawSw(SkCanvas* canvas,
+                            cc::CompositorFrame* frame) OVERRIDE;
+  virtual void ReturnResources(
+      const cc::CompositorFrameAck* frame_ack) OVERRIDE;
   virtual void SetMemoryPolicy(
       const SynchronousCompositorMemoryPolicy& policy) OVERRIDE;
   virtual void DidChangeRootLayerScrollOffset() OVERRIDE;
@@ -68,8 +75,6 @@ class SynchronousCompositorImpl
   virtual void DidDestroySynchronousOutputSurface(
       SynchronousCompositorOutputSurface* output_surface) OVERRIDE;
   virtual void SetContinuousInvalidate(bool enable) OVERRIDE;
-  virtual void UpdateFrameMetaData(
-      const cc::CompositorFrameMetadata& frame_info) OVERRIDE;
   virtual void DidActivatePendingTree() OVERRIDE;
 
   // LayerScrollOffsetDelegate
@@ -91,8 +96,7 @@ class SynchronousCompositorImpl
   virtual ~SynchronousCompositorImpl();
   friend class WebContentsUserData<SynchronousCompositorImpl>;
 
-  void DidCreateSynchronousOutputSurface(
-      SynchronousCompositorOutputSurface* output_surface);
+  void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info);
   bool CalledOnValidThread() const;
 
   SynchronousCompositorClient* compositor_client_;
@@ -100,6 +104,8 @@ class SynchronousCompositorImpl
   WebContents* contents_;
   cc::InputHandler* input_handler_;
 
+  base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
 };