Add DisplayScheduler for Surfaces

cc/surfaces/onscreen_display_client.h

Index: cc/surfaces/onscreen_display_client.h
diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h
index ef61e53ef580fa82afb6c2b43e6048b5778a1272..5cd88f2bfae8234120032f990fea5121bf790c5f 100644
--- a/cc/surfaces/onscreen_display_client.h
+++ b/cc/surfaces/onscreen_display_client.h
@@ -16,6 +16,7 @@
 
 namespace cc {
 class ContextProvider;
+class DisplayScheduler;
 class SurfaceManager;
 class SurfaceDisplayOutputSurface;
 
@@ -40,9 +41,6 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient
   }
 
   // DisplayClient implementation.
-  void DisplayDamaged() override;
-  void DidSwapBuffers() override;
-  void DidSwapBuffersComplete() override;
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval) override;
   void OutputSurfaceLost() override;
@@ -51,21 +49,12 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient
   bool output_surface_lost() { return output_surface_lost_; }
 
  private:
-  void ScheduleDraw();
-  void Draw();
-
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<Display> display_;
+  scoped_ptr<DisplayScheduler> scheduler_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   SurfaceDisplayOutputSurface* surface_display_output_surface_;
-  bool scheduled_draw_;
   bool output_surface_lost_;
-  // True if a draw should be scheduled, but it's hit the limit on max frames
-  // pending.
-  bool deferred_draw_;
-  int pending_frames_;
-
-  base::WeakPtrFactory<OnscreenDisplayClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient);
 };