cc: Throttle swaps in Scheduler instead of OutputSurface

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index b751f06c9416b1ccfec2e2cb26ad723d6925fa4d..5280bcf7521d6936233d6abdbd2ed1e5f8040759 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -104,13 +104,13 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   // thread.
   virtual bool BindToClient(OutputSurfaceClient* client);
 
+  // Enable or disable vsync.
+  void SetThrottleFrameProduction(bool enable);
+
   void InitializeBeginImplFrameEmulation(

[brianderson, 2014/03/13 21:11:52]

In the interest of simplifying OutputSurface, we could probably move all the
BeginImplFrameEmulation logic into a separate class owned by the LTHI.

       base::SingleThreadTaskRunner* task_runner,
-      bool throttle_frame_production,
       base::TimeDelta interval);
 
-  void SetMaxFramesPending(int max_frames_pending);
-
   virtual void EnsureBackbuffer();
   virtual void DiscardBackbuffer();
 
@@ -156,16 +156,15 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   scoped_ptr<SoftwareOutputDevice> software_device_;
   gfx::Size surface_size_;
   float device_scale_factor_;
+  base::TimeDelta begin_impl_frame_interval_;
 
   // The FrameRateController is deprecated.
   // Platforms should move to native BeginImplFrames instead.
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval);
-  virtual void FrameRateControllerTick(bool throttled,
-                                       const BeginFrameArgs& args) OVERRIDE;
+  virtual void FrameRateControllerTick(const BeginFrameArgs& args) OVERRIDE;
   scoped_ptr<FrameRateController> frame_rate_controller_;
-  int max_frames_pending_;
-  int pending_swap_buffers_;
+  bool throttle_frame_production_;
   bool needs_begin_impl_frame_;
   bool client_ready_for_begin_impl_frame_;
 
@@ -200,6 +199,8 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
   void UpdateAndMeasureGpuLatency();
 
+  bool is_lost_;
+
   // check_for_retroactive_begin_impl_frame_pending_ is used to avoid posting
   // redundant checks for a retroactive BeginImplFrame.
   bool check_for_retroactive_begin_impl_frame_pending_;