Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1335)

Unified Diff: cc/animation/element_animations.cc

Issue 2346583002: cc : Fix the bug in tracking currently running animations for an element (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
}
}
« no previous file with comments | « no previous file | cc/animation/element_animations_unittest.cc » ('j') | cc/animation/element_animations_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698