Index: cc/scheduler/frame_rate_controller.cc |
diff --git a/cc/scheduler/frame_rate_controller.cc b/cc/scheduler/frame_rate_controller.cc |
index ce71faaad270da321c9eed8383a182347238a1a0..60d97fb71e2f301dd9193b14c3664d553f746336 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(); |
} |
@@ -119,10 +122,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) |