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 c699d99e19772e5afb607752df6e72b78d429c85..c042c1b4af301858b7aa6b4700207a223e55ba9c 100644
--- a/cc/surfaces/onscreen_display_client.h
+++ b/cc/surfaces/onscreen_display_client.h
@@ -16,8 +16,10 @@
 
 namespace cc {
 class ContextProvider;
+class DisplayScheduler;
 class SurfaceManager;
 class SurfaceDisplayOutputSurface;
+class SyntheticBeginFrameSource;
 
 // This class provides a DisplayClient implementation for drawing directly to an
 // onscreen context.
@@ -40,9 +42,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;
@@ -50,23 +49,14 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient
 
   bool output_surface_lost() { return output_surface_lost_; }
 
- private:
-  void ScheduleDraw();
-  void Draw();
-
  protected:
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<Display> display_;
+  scoped_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source_;
+  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);
 };