cc: Throttle swaps in Scheduler instead of OutputSurface

cc/scheduler/frame_rate_controller.h

Index: cc/scheduler/frame_rate_controller.h
diff --git a/cc/scheduler/frame_rate_controller.h b/cc/scheduler/frame_rate_controller.h
index 6d86d97496679c4efb629c8b8e5b7dadacf405bd..2ec62aca72d5d5b4610c3d2c6c63e5933b545fd7 100644
--- a/cc/scheduler/frame_rate_controller.h
+++ b/cc/scheduler/frame_rate_controller.h
@@ -11,6 +11,7 @@
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
+#include "cc/scheduler/time_source.h"
 
 namespace base { class SingleThreadTaskRunner; }
 
@@ -24,20 +25,14 @@ class CC_EXPORT FrameRateControllerClient {
   virtual ~FrameRateControllerClient() {}
 
  public:
-  // Throttled is true when we have a maximum number of frames pending.
-  virtual void FrameRateControllerTick(bool throttled,
-                                       const BeginFrameArgs& args) = 0;
+  virtual void FrameRateControllerTick(const BeginFrameArgs& args) = 0;
 };
 
-class FrameRateControllerTimeSourceAdapter;
-
 // The FrameRateController is used in cases where we self-tick (i.e. BeginFrame
 // is not sent by a parent compositor.
-class CC_EXPORT FrameRateController {
+class CC_EXPORT FrameRateController : TimeSourceClient {
  public:
   explicit FrameRateController(scoped_refptr<TimeSource> timer);
-  // Alternate form of FrameRateController with unthrottled frame-rate.
-  explicit FrameRateController(base::SingleThreadTaskRunner* task_runner);
   virtual ~FrameRateController();
 
   void SetClient(FrameRateControllerClient* client) { client_ = client; }
@@ -48,50 +43,24 @@ class CC_EXPORT FrameRateController {
 
   bool IsActive() { return active_; }
 
-  // Use the following methods to adjust target frame rate.
-  //
-  // Multiple frames can be in-progress, but for every DidSwapBuffers, a
-  // DidFinishFrame should be posted.
-  //
-  // If the rendering pipeline crashes, call DidAbortAllPendingFrames.
-  void DidSwapBuffers();
-  void DidSwapBuffersComplete();
-  void DidAbortAllPendingFrames();
-  void SetMaxSwapsPending(int max_swaps_pending);  // 0 for unlimited.
-  int MaxSwapsPending() const { return max_swaps_pending_; }
-  int NumSwapsPendingForTesting() const { return num_frames_pending_; }
-
   void SetTimebaseAndInterval(base::TimeTicks timebase,
                               base::TimeDelta interval);
   void SetDeadlineAdjustment(base::TimeDelta delta);
 
- protected:
-  friend class FrameRateControllerTimeSourceAdapter;
-  void OnTimerTick();
-
-  void PostManualTick();
-  void ManualTick();
+  virtual void OnTimerTick() OVERRIDE;
 
+ protected:
     // This returns null for unthrottled frame-rate.
   base::TimeTicks NextTickTime();
   // This returns now for unthrottled frame-rate.
   base::TimeTicks LastTickTime();
 
   FrameRateControllerClient* client_;
-  int num_frames_pending_;
-  int max_swaps_pending_;
   base::TimeDelta interval_;
   base::TimeDelta deadline_adjustment_;
   scoped_refptr<TimeSource> time_source_;
-  scoped_ptr<FrameRateControllerTimeSourceAdapter> time_source_client_adapter_;
   bool active_;
 
-  // Members for unthrottled frame-rate.
-  bool is_time_source_throttling_;
-  bool manual_tick_pending_;
-  base::SingleThreadTaskRunner* task_runner_;
-  base::WeakPtrFactory<FrameRateController> weak_factory_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FrameRateController);
 };