Android Browser Compositor: Add ScheduleComposite() callback.

content/public/browser/android/compositor.h

Index: content/public/browser/android/compositor.h
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index 9019e4776ba3d7ba56a878e41ea89d858398962a..9f158cf2ab210ecd0e66b504cfc46ab74a1cd6c5 100644
--- a/content/public/browser/android/compositor.h
+++ b/content/public/browser/android/compositor.h
@@ -19,6 +19,12 @@ namespace content {
 // An interface to the browser-side compositor.
 class Compositor {
  public:
+  class Client {
+   public:
+    // Tells the client that it should schedule a composite.
+    virtual void ScheduleComposite() = 0;
+  };
+
   virtual ~Compositor() {}
 
   // Performs the global initialization needed before any compositor
@@ -26,7 +32,7 @@ class Compositor {
   static void Initialize();
 
   // Creates and returns a compositor instance.
-  static Compositor* Create();
+  static Compositor* Create(Client* client);
 
   // Attaches the layer tree.
   virtual void SetRootLayer(WebKit::WebLayer* root) = 0;
@@ -42,11 +48,8 @@ class Compositor {
   // The buffer is not modified if false is returned.
   virtual bool CompositeAndReadback(void *pixels, const gfx::Rect& rect) = 0;
 
-  // Callback to be run after the frame has been drawn. It passes back
-  // a synchronization point identifier.
-  typedef base::Callback<void(uint32)> SurfacePresentedCallback;
-
-  virtual void OnSurfaceUpdated(const SurfacePresentedCallback& callback) = 0;
+  // Composite immediately. Used in single-threaded mode.
+  virtual void Composite() = 0;
 
  protected:
   Compositor() {}