Make Android CompositorImpl use scheduled SingleThreadProxy

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 61743af77de6ae9a17565a2004c341076b57c1de..20b19427d9bee7a67c7d211f9f509562d13d27b5 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -85,8 +85,6 @@ class CONTENT_EXPORT CompositorImpl
   virtual void DidCompleteSwapBuffers() OVERRIDE;
 
   // LayerTreeHostSingleThreadClient implementation.
-  virtual void ScheduleComposite() OVERRIDE;
-  virtual void ScheduleAnimation() OVERRIDE;
   virtual void DidPostSwapBuffers() OVERRIDE;
   virtual void DidAbortSwapBuffers() OVERRIDE;
 
@@ -101,34 +99,6 @@ class CONTENT_EXPORT CompositorImpl
                        base::TimeDelta vsync_period) OVERRIDE;
   virtual void SetNeedsAnimate() OVERRIDE;
 
-  enum CompositingTrigger {
-    DO_NOT_COMPOSITE,
-    COMPOSITE_IMMEDIATELY,
-    COMPOSITE_EVENTUALLY,
-  };
-  void PostComposite(CompositingTrigger trigger);
-  void Composite(CompositingTrigger trigger);
-
-  bool WillCompositeThisFrame() const {
-    return current_composite_task_ &&
-           !current_composite_task_->callback().is_null();
-  }
-  bool DidCompositeThisFrame() const {
-    return current_composite_task_ &&
-           current_composite_task_->callback().is_null();
-  }
-  bool WillComposite() const {
-    return WillCompositeThisFrame() ||
-           composite_on_vsync_trigger_ != DO_NOT_COMPOSITE;
-  }
-  void CancelComposite() {
-    DCHECK(WillComposite());
-    if (WillCompositeThisFrame())
-      current_composite_task_->Cancel();
-    current_composite_task_.reset();
-    composite_on_vsync_trigger_ = DO_NOT_COMPOSITE;
-    will_composite_immediately_ = false;
-  }
   cc::UIResourceId GenerateUIResourceFromUIResourceBitmap(
       const cc::UIResourceBitmap& bitmap,
       bool is_transient);
@@ -149,36 +119,10 @@ class CONTENT_EXPORT CompositorImpl
 
   gfx::NativeWindow root_window_;
 
-  // Used locally to track whether a call to LTH::Composite() did result in
-  // a posted SwapBuffers().
-  bool did_post_swapbuffers_;
-
-  // Used locally to inhibit ScheduleComposite() during Layout().
-  bool ignore_schedule_composite_;
-
-  // Whether we need to composite in general because of any invalidation or
-  // explicit request.
-  bool needs_composite_;
-
-  // Whether we need to update animations on the next composite.
-  bool needs_animate_;
-
-  // Whether we posted a task and are about to composite.
-  bool will_composite_immediately_;
-
-  // How we should schedule Composite during the next vsync.
-  CompositingTrigger composite_on_vsync_trigger_;
-
-  // The Composite operation scheduled for the current vsync interval.
-  scoped_ptr<base::CancelableClosure> current_composite_task_;
-
   // The number of SwapBuffer calls that have not returned and ACK'd from
   // the GPU thread.
   unsigned int pending_swapbuffers_;
 
-  base::TimeDelta vsync_period_;
-  base::TimeTicks last_vsync_;
-
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);