| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index 9fe5b9e8c8e6302d09d566291aada056a04bd4cd..d6d0723af70de1a8b9a6895f723e1b513ada746e 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -689,7 +689,7 @@ void ThreadProxy::ScheduledActionSendBeginMainFrame() {
|
| scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state(
|
| new BeginMainFrameAndCommitState);
|
| begin_main_frame_state->monotonic_frame_begin_time =
|
| - layer_tree_host_impl_->CurrentPhysicalTimeTicks();
|
| + layer_tree_host_impl_->CurrentFrameTimeTicks();
|
| begin_main_frame_state->scroll_info =
|
| layer_tree_host_impl_->ProcessScrollDeltas();
|
|
|
| @@ -1044,7 +1044,7 @@ DrawSwapReadbackResult ThreadProxy::DrawSwapReadbackInternal(
|
| base::AutoReset<bool> mark_inside(&inside_draw_, true);
|
|
|
| // Advance our animations.
|
| - base::TimeTicks monotonic_time =
|
| + gfx::FrameTime monotonic_time =
|
| layer_tree_host_impl_->CurrentFrameTimeTicks();
|
| base::Time wall_clock_time = layer_tree_host_impl_->CurrentFrameTime();
|
|
|
| @@ -1230,7 +1230,7 @@ DrawSwapReadbackResult ThreadProxy::ScheduledActionDrawAndReadback() {
|
| forced_draw, swap_requested, readback_requested);
|
| }
|
|
|
| -void ThreadProxy::DidAnticipatedDrawTimeChange(base::TimeTicks time) {
|
| +void ThreadProxy::DidAnticipatedDrawTimeChange(gfx::FrameTime time) {
|
| if (current_resource_update_controller_on_impl_thread_)
|
| current_resource_update_controller_on_impl_thread_->PerformMoreUpdates(
|
| time);
|
| @@ -1254,8 +1254,9 @@ base::TimeDelta ThreadProxy::CommitToActivateDurationEstimate() {
|
| kCommitAndActivationDurationEstimationPercentile);
|
| }
|
|
|
| -void ThreadProxy::PostBeginImplFrameDeadline(const base::Closure& closure,
|
| - base::TimeTicks deadline) {
|
| +void ThreadProxy::PostBeginImplFrameDeadline(
|
| + const base::Closure& closure,
|
| + gfx::FrameTime deadline) {
|
| base::TimeDelta delta = deadline - gfx::FrameTime::Now();
|
| if (delta <= base::TimeDelta())
|
| delta = base::TimeDelta();
|
| @@ -1499,7 +1500,7 @@ void ThreadProxy::RenewTreePriority() {
|
| layer_tree_host_impl_->IsCurrentlyScrolling() ||
|
| layer_tree_host_impl_->page_scale_animation_active();
|
|
|
| - base::TimeTicks now = layer_tree_host_impl_->CurrentPhysicalTimeTicks();
|
| + base::TimeTicks now = base::TimeTicks::Now();
|
|
|
| // Update expiration time if smoothness currently takes priority.
|
| if (smoothness_takes_priority) {
|
|
|