Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1151)

Unified Diff: cc/scheduler/frame_rate_controller.cc

Issue 16871016: cc: Use BeginFrameArgs (Closed) Base URL: http://git.chromium.org/chromium/src.git@bfargs2
Patch Set: StateMachine test working; Reworked readback. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/scheduler/frame_rate_controller.cc
diff --git a/cc/scheduler/frame_rate_controller.cc b/cc/scheduler/frame_rate_controller.cc
index c2294ea099f17a531312eb59e0696b186064c409..174e55adc539bfaf43fcb5e3cf05086d1abefc3a 100644
--- a/cc/scheduler/frame_rate_controller.cc
+++ b/cc/scheduler/frame_rate_controller.cc
@@ -85,7 +85,10 @@ BeginFrameArgs FrameRateController::SetActive(bool active) {
// TODO(brianderson): Use an adaptive parent compositor deadline.
base::TimeTicks frame_time = NextTickTime() - interval_;
base::TimeTicks deadline = NextTickTime();
- return BeginFrameArgs::Create(frame_time, deadline, interval_);
+ BeginFrameArgs args =
+ BeginFrameArgs::Create(frame_time, deadline, interval_);
+ args.AdjustDeadline(deadline_adjustment_);
+ return args;
}
return BeginFrameArgs();
}
@@ -118,10 +121,11 @@ void FrameRateController::OnTimerTick() {
if (client_) {
// TODO(brianderson): Use an adaptive parent compositor deadline.
base::TimeTicks frame_time = LastTickTime();
- base::TimeTicks deadline = NextTickTime() + deadline_adjustment_;
- client_->FrameRateControllerTick(
- throttled,
- BeginFrameArgs::Create(frame_time, deadline, interval_));
+ base::TimeTicks deadline = NextTickTime();
+ BeginFrameArgs args =
+ BeginFrameArgs::Create(frame_time, deadline, interval_);
+ args.AdjustDeadline(deadline_adjustment_);
+ client_->FrameRateControllerTick(throttled, args);
}
if (!is_time_source_throttling_ && !throttled)

Powered by Google App Engine
This is Rietveld 408576698