Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/cc/scheduler/frame_rate_controller.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/frame_rate_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/base/thread.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/time_source.h"
 
 namespace cc {
 
 class FrameRateControllerTimeSourceAdapter : public TimeSourceClient {
  public:
   static scoped_ptr<FrameRateControllerTimeSourceAdapter> Create(
       FrameRateController* frame_rate_controller) {
     return make_scoped_ptr(
         new FrameRateControllerTimeSourceAdapter(frame_rate_controller));
   }
   virtual ~FrameRateControllerTimeSourceAdapter() {}
 
-  virtual void OnTimerTick() OVERRIDE {
-    frame_rate_controller_->OnTimerTick();
-  }
+  virtual void OnTimerTick() OVERRIDE { frame_rate_controller_->OnTimerTick(); }
 
  private:
   explicit FrameRateControllerTimeSourceAdapter(
       FrameRateController* frame_rate_controller)
       : frame_rate_controller_(frame_rate_controller) {}
 
   FrameRateController* frame_rate_controller_;
 };
 
 FrameRateController::FrameRateController(scoped_refptr<TimeSource> timer)
     : client_(NULL),
       num_frames_pending_(0),
-      max_swaps_pending_(0),
+      max_frames_pending_(0),
       time_source_(timer),
       active_(false),
       is_time_source_throttling_(true),
       weak_factory_(this),
       thread_(NULL) {
   time_source_client_adapter_ =
       FrameRateControllerTimeSourceAdapter::Create(this);
   time_source_->SetClient(time_source_client_adapter_.get());
 }
 
 FrameRateController::FrameRateController(Thread* thread)
     : client_(NULL),
       num_frames_pending_(0),
-      max_swaps_pending_(0),
+      max_frames_pending_(0),
       active_(false),
       is_time_source_throttling_(false),
       weak_factory_(this),
       thread_(thread) {}
 
 FrameRateController::~FrameRateController() {
   if (is_time_source_throttling_)
     time_source_->SetActive(false);
 }
 
 void FrameRateController::SetActive(bool active) {
   if (active_ == active)
     return;
   TRACE_EVENT1("cc", "FrameRateController::SetActive", "active", active);
   active_ = active;
 
   if (is_time_source_throttling_) {
     time_source_->SetActive(active);
   } else {
     if (active)
       PostManualTick();
     else
       weak_factory_.InvalidateWeakPtrs();
   }
 }
 
-void FrameRateController::SetMaxSwapsPending(int max_swaps_pending) {
-  DCHECK_GE(max_swaps_pending, 0);
-  max_swaps_pending_ = max_swaps_pending;
+void FrameRateController::SetMaxFramesPending(int max_frames_pending) {
+  DCHECK_GE(max_frames_pending, 0);
+  max_frames_pending_ = max_frames_pending;
 }
 
 void FrameRateController::SetTimebaseAndInterval(base::TimeTicks timebase,
                                                  base::TimeDelta interval) {
   if (is_time_source_throttling_)
     time_source_->SetTimebaseAndInterval(timebase, interval);
 }
 
 void FrameRateController::OnTimerTick() {
-  TRACE_EVENT0("cc", "FrameRateController::OnTimerTick");
   DCHECK(active_);
 
   // Check if we have too many frames in flight.
   bool throttled =
-      max_swaps_pending_ && num_frames_pending_ >= max_swaps_pending_;
+      max_frames_pending_ && num_frames_pending_ >= max_frames_pending_;
   TRACE_COUNTER_ID1("cc", "ThrottledCompositor", thread_, throttled);
 
-  if (client_) {
-    client_->FrameRateControllerTick(throttled);
-  }
+  if (client_)
+    client_->BeginFrame(throttled);
 
   if (!is_time_source_throttling_ && !throttled)
     PostManualTick();
 }
 
 void FrameRateController::PostManualTick() {
   if (active_) {
     thread_->PostTask(base::Bind(&FrameRateController::ManualTick,
                                  weak_factory_.GetWeakPtr()));
   }
 }
 
-void FrameRateController::ManualTick() {
-  OnTimerTick();
-}
+void FrameRateController::ManualTick() { OnTimerTick(); }
 
 void FrameRateController::DidSwapBuffers() {
   num_frames_pending_++;
 }
 
 void FrameRateController::DidSwapBuffersComplete() {
   DCHECK_GT(num_frames_pending_, 0);
   num_frames_pending_--;
   if (!is_time_source_throttling_)
     PostManualTick();
@@ skipping 11 matching lines @@
 }
 
 base::TimeTicks FrameRateController::LastTickTime() {
   if (is_time_source_throttling_)
     return time_source_->LastTickTime();
 
   return base::TimeTicks::Now();
 }
 
 }  // namespace cc