Android: Move scheduling logic to CompositorImpl

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 b825a315e64fcb570506d7f352db648ce5ad2695..e8793ce70b17298a3ca98e006d67fb5b14ee35ec 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -63,7 +64,6 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetHasTransparentBackground(bool flag) OVERRIDE;
   virtual bool CompositeAndReadback(
       void *pixels, const gfx::Rect& rect) OVERRIDE;
-  virtual void Composite() OVERRIDE;
   virtual cc::UIResourceId GenerateUIResource(const SkBitmap& bitmap,
                                               bool is_transient) OVERRIDE;
   virtual cc::UIResourceId GenerateCompressedUIResource(const gfx::Size& size,
@@ -76,7 +76,7 @@ class CONTENT_EXPORT CompositorImpl
   virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
   virtual void DidBeginMainFrame() OVERRIDE {}
   virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE {}
-  virtual void Layout() OVERRIDE {}
+  virtual void Layout() OVERRIDE;
   virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
                                    float page_scale) OVERRIDE {}
   virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
@@ -100,8 +100,11 @@ class CONTENT_EXPORT CompositorImpl
 
   // WindowAndroidCompositor implementation.
   virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) OVERRIDE;
+  virtual void OnVSync(base::TimeTicks frame_time,
+                       base::TimeDelta vsync_period) OVERRIDE;
 
  private:
+  void Composite(bool is_vsync);
   cc::UIResourceId GenerateUIResourceFromUIResourceBitmap(
       const cc::UIResourceBitmap& bitmap,
       bool is_transient);
@@ -126,6 +129,13 @@ class CONTENT_EXPORT CompositorImpl
 
   gfx::NativeWindow root_window_;
 
+  bool did_post_swapbuffers_;
+  bool need_to_composite_;
+  bool can_composite_outside_vsync_;
+  unsigned int pending_swapbuffers_;
+
+  base::WeakPtrFactory<CompositorImpl> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };