| Index: cc/animation/layer_animation_controller.cc
|
| diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
|
| index 918d8b80e20135eb4ea6ddbdced567f7cb88ace5..f255db5befe8a8c6fde511993d38e0041e369e27 100644
|
| --- a/cc/animation/layer_animation_controller.cc
|
| +++ b/cc/animation/layer_animation_controller.cc
|
| @@ -280,16 +280,15 @@ void LayerAnimationController::SetAnimationRegistrar(
|
| }
|
|
|
| void LayerAnimationController::NotifyAnimationStarted(
|
| - const AnimationEvent& event,
|
| - double wall_clock_time) {
|
| + const AnimationEvent& event) {
|
| base::TimeTicks monotonic_time = base::TimeTicks::FromInternalValue(
|
| event.monotonic_time * base::Time::kMicrosecondsPerSecond);
|
| if (event.is_impl_only) {
|
| FOR_EACH_OBSERVER(LayerAnimationEventObserver, event_observers_,
|
| OnAnimationStarted(event));
|
| if (layer_animation_delegate_)
|
| - layer_animation_delegate_->NotifyAnimationStarted(
|
| - wall_clock_time, monotonic_time, event.target_property);
|
| + layer_animation_delegate_->NotifyAnimationStarted(monotonic_time,
|
| + event.target_property);
|
|
|
| return;
|
| }
|
| @@ -305,7 +304,7 @@ void LayerAnimationController::NotifyAnimationStarted(
|
| OnAnimationStarted(event));
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationStarted(
|
| - wall_clock_time, monotonic_time, event.target_property);
|
| + monotonic_time, event.target_property);
|
|
|
| return;
|
| }
|
| @@ -313,14 +312,13 @@ void LayerAnimationController::NotifyAnimationStarted(
|
| }
|
|
|
| void LayerAnimationController::NotifyAnimationFinished(
|
| - const AnimationEvent& event,
|
| - double wall_clock_time) {
|
| + const AnimationEvent& event) {
|
| base::TimeTicks monotonic_time = base::TimeTicks::FromInternalValue(
|
| event.monotonic_time * base::Time::kMicrosecondsPerSecond);
|
| if (event.is_impl_only) {
|
| if (layer_animation_delegate_)
|
| - layer_animation_delegate_->NotifyAnimationFinished(
|
| - wall_clock_time, monotonic_time, event.target_property);
|
| + layer_animation_delegate_->NotifyAnimationFinished(monotonic_time,
|
| + event.target_property);
|
| return;
|
| }
|
|
|
| @@ -330,7 +328,7 @@ void LayerAnimationController::NotifyAnimationFinished(
|
| active_animations_[i]->set_received_finished_event(true);
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationFinished(
|
| - wall_clock_time, monotonic_time, event.target_property);
|
| + monotonic_time, event.target_property);
|
|
|
| return;
|
| }
|
|
|