cc: Add BeginFrameArgs

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"
@@ skipping 19 matching lines @@
       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),
+      interval_(base::TimeDelta::FromMicroseconds(16666)),

[Sami, 2013/06/13 10:01:07]

It might be worth making the default frame interval a static constant in
BeginFrameArgs too to avoid sprinkling it around the codebase.

[brianderson, 2013/06/14 20:12:02]

Good idea.

       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),
+      interval_(base::TimeDelta::FromMicroseconds(16666)),
       active_(false),
       is_time_source_throttling_(false),
       weak_factory_(this),
       thread_(thread) {}
 
 FrameRateController::~FrameRateController() {
   if (is_time_source_throttling_)
     time_source_->SetActive(false);
 }
 
@@ skipping 13 matching lines @@
   }
 }
 
 void FrameRateController::SetMaxSwapsPending(int max_swaps_pending) {
   DCHECK_GE(max_swaps_pending, 0);
   max_swaps_pending_ = max_swaps_pending;
 }
 
 void FrameRateController::SetTimebaseAndInterval(base::TimeTicks timebase,
                                                  base::TimeDelta interval) {
+  interval_ = interval;
   if (is_time_source_throttling_)
     time_source_->SetTimebaseAndInterval(timebase, interval);
 }
 
+void FrameRateController::SetDeadlineAdjustment(base::TimeDelta delta) {
+  deadline_adjustment_ = delta;
+}
+
 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_;
   TRACE_COUNTER_ID1("cc", "ThrottledCompositor", thread_, throttled);
 
   if (client_) {
-    client_->FrameRateControllerTick(throttled);
+    // TODO(brianderson): Use an adaptive parent compositor deadline.
+    base::TimeTicks frame_time = LastTickTime();
+    base::TimeTicks deadline = NextTickTime() + deadline_adjustment_;
+    client_->FrameRateControllerTick(
+        throttled,
+        BeginFrameArgs::CreateBeginFrame(frame_time, deadline, interval_));
   }
 
   if (!is_time_source_throttling_ && !throttled)
     PostManualTick();
 }
 
 void FrameRateController::PostManualTick() {
   if (active_) {
     thread_->PostTask(base::Bind(&FrameRateController::ManualTick,
                                  weak_factory_.GetWeakPtr()));
@@ skipping 27 matching lines @@
 }
 
 base::TimeTicks FrameRateController::LastTickTime() {
   if (is_time_source_throttling_)
     return time_source_->LastTickTime();
 
   return base::TimeTicks::Now();
 }
 
 }  // namespace cc