Chromium Code Reviews| Index: cc/animation/element_animations.cc |
| diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc |
| index 35de36725d0732d55d31f11a50e2434867524243..32da627aa5cbbc9957830a1113137a6e10ff817f 100644 |
| --- a/cc/animation/element_animations.cc |
| +++ b/cc/animation/element_animations.cc |
| @@ -635,11 +635,11 @@ void ElementAnimations::UpdateClientAnimationStateInternal( |
| animation->affects_active_elements(); |
| animation_state->potentially_animating_for_pending_elements |= |
| animation->affects_pending_elements(); |
| - animation_state->currently_running_for_active_elements = |
| - animation_state->potentially_animating_for_active_elements && |
| + animation_state->currently_running_for_active_elements |= |
| + animation->affects_active_elements() && |
| animation->InEffect(last_tick_time_); |
| - animation_state->currently_running_for_pending_elements = |
| - animation_state->potentially_animating_for_pending_elements && |
| + animation_state->currently_running_for_pending_elements |= |
| + animation->affects_pending_elements() && |
| animation->InEffect(last_tick_time_); |
|
loyso (OOO)
2016/09/14 23:49:08
NIT: Would be nice to add a DCHECK as a loop invar
|
| } |
| } |