Android: Move scheduling logic to CompositorImpl

content/public/browser/android/compositor_client.h

Index: content/public/browser/android/compositor_client.h
diff --git a/content/public/browser/android/compositor_client.h b/content/public/browser/android/compositor_client.h
index d835de199d7fa58adb8722e9956602b28b2c575c..09a12e5df1f60cf666a9fec7ece5a2f9be4d6e64 100644
--- a/content/public/browser/android/compositor_client.h
+++ b/content/public/browser/android/compositor_client.h
@@ -11,14 +11,11 @@ namespace content {
 
 class CONTENT_EXPORT CompositorClient {
  public:
-  // Tells the client that it should schedule a composite.
-  virtual void ScheduleComposite() = 0;
+  // Gives the client a chance for layout changes before compositing.
+  virtual void Layout() {}
 
   // The compositor has completed swapping a frame.
-  virtual void OnSwapBuffersCompleted() {}
-
-  // The compositor will eventually swap a frame.
-  virtual void OnSwapBuffersPosted() {}
+  virtual void OnSwapBuffersCompleted(int pending_swap_buffers) {}
 
   // Tells the client that GL resources were lost and need to be reinitialized.
   virtual void DidLoseResources() {}