| Index: cc/scheduler/frame_rate_controller.cc
|
| diff --git a/cc/scheduler/frame_rate_controller.cc b/cc/scheduler/frame_rate_controller.cc
|
| index 2729748859bf030b1c5cd88576542ef1b6d7f782..1c81bfd4080176d2d9214db09e265ca45e552bb6 100644
|
| --- a/cc/scheduler/frame_rate_controller.cc
|
| +++ b/cc/scheduler/frame_rate_controller.cc
|
| @@ -74,9 +74,11 @@ BeginFrameArgs FrameRateController::SetActive(bool active) {
|
| active_ = active;
|
|
|
| if (is_time_source_throttling_) {
|
| - base::TimeTicks missed_tick_time = time_source_->SetActive(active);
|
| + gfx::FrameTime missed_tick_time =
|
| + gfx::FrameTime::Unsafe_FromTimeTicks(
|
| + time_source_->SetActive(active));
|
| if (!missed_tick_time.is_null()) {
|
| - base::TimeTicks deadline = NextTickTime();
|
| + gfx::FrameTime deadline = NextTickTime();
|
| return BeginFrameArgs::Create(
|
| missed_tick_time, deadline + deadline_adjustment_, interval_);
|
| }
|
| @@ -117,8 +119,8 @@ void FrameRateController::OnTimerTick() {
|
|
|
| if (client_) {
|
| // TODO(brianderson): Use an adaptive parent compositor deadline.
|
| - base::TimeTicks frame_time = LastTickTime();
|
| - base::TimeTicks deadline = NextTickTime();
|
| + gfx::FrameTime frame_time = LastTickTime();
|
| + gfx::FrameTime deadline = NextTickTime();
|
| BeginFrameArgs args = BeginFrameArgs::Create(
|
| frame_time, deadline + deadline_adjustment_, interval_);
|
| client_->FrameRateControllerTick(throttled, args);
|
| @@ -155,16 +157,19 @@ void FrameRateController::DidAbortAllPendingFrames() {
|
| num_frames_pending_ = 0;
|
| }
|
|
|
| -base::TimeTicks FrameRateController::NextTickTime() {
|
| - if (is_time_source_throttling_)
|
| - return time_source_->NextTickTime();
|
| +gfx::FrameTime FrameRateController::NextTickTime() {
|
| + if (is_time_source_throttling_) {
|
| + return gfx::FrameTime::Unsafe_FromTimeTicks(
|
| + time_source_->NextTickTime());
|
| + }
|
|
|
| - return base::TimeTicks();
|
| + return gfx::FrameTime();
|
| }
|
|
|
| -base::TimeTicks FrameRateController::LastTickTime() {
|
| +gfx::FrameTime FrameRateController::LastTickTime() {
|
| if (is_time_source_throttling_)
|
| - return time_source_->LastTickTime();
|
| + return gfx::FrameTime::Unsafe_FromTimeTicks(
|
| + time_source_->LastTickTime());
|
|
|
| return gfx::FrameTime::Now();
|
| }
|
|
|