| Index: cc/animation/element_animations.cc
|
| diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc
|
| index f75ffbe678211b926493a49636ccb518852ebfc4..80823d226b1b3a4893705570d3a4ecfaafbdf0d4 100644
|
| --- a/cc/animation/element_animations.cc
|
| +++ b/cc/animation/element_animations.cc
|
| @@ -1014,10 +1014,14 @@ void ElementAnimations::UpdateActivation(UpdateActivationType type) {
|
| }
|
| }
|
|
|
| - if (is_active_ && (!was_active || force))
|
| + if (is_active_ && (!was_active || force)) {
|
| animation_host_->DidActivateElementAnimations(this);
|
| - else if (!is_active_ && (was_active || force))
|
| + } else if (!is_active_ && (was_active || force)) {
|
| + // Resetting last_tick_time_ here ensures that calling ::UpdateState
|
| + // before ::Animate doesn't start an animation.
|
| + last_tick_time_ = base::TimeTicks();
|
| animation_host_->DidDeactivateElementAnimations(this);
|
| + }
|
| }
|
| }
|
|
|
|
|