| Index: cc/animation/layer_animation_controller.cc
|
| diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
|
| index b779a37957a8d165d517e611f0ee37da334bc963..a3393df3940fcbf966b7148b52e62e68dfc9a040 100644
|
| --- a/cc/animation/layer_animation_controller.cc
|
| +++ b/cc/animation/layer_animation_controller.cc
|
| @@ -148,7 +148,8 @@ void LayerAnimationController::AccumulatePropertyUpdates(
|
| if (!animation->InEffect(monotonic_time))
|
| continue;
|
|
|
| - double trimmed = animation->TrimTimeToCurrentIteration(monotonic_time);
|
| + double trimmed =
|
| + animation->TrimTimeToCurrentIteration(monotonic_time).InSecondsF();
|
| switch (animation->target_property()) {
|
| case Animation::Opacity: {
|
| AnimationEvent event(AnimationEvent::PropertyUpdate,
|
| @@ -856,8 +857,9 @@ void LayerAnimationController::TickAnimations(base::TimeTicks monotonic_time) {
|
| if (!animations_[i]->InEffect(monotonic_time))
|
| continue;
|
|
|
| - double trimmed =
|
| - animations_[i]->TrimTimeToCurrentIteration(monotonic_time);
|
| + double trimmed = animations_[i]
|
| + ->TrimTimeToCurrentIteration(monotonic_time)
|
| + .InSecondsF();
|
|
|
| switch (animations_[i]->target_property()) {
|
| case Animation::Transform: {
|
|
|