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

Unified Diff: cc/animation/element_animations.cc

Issue 2527623002: add has_element_in_any_list check in ElementAnimations::UpdateActivation (Closed)
Patch Set: move has_element_in_any_list check to ::UpdateActivation Created 4 years, 1 month 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
« no previous file with comments | « no previous file | cc/animation/element_animations_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/element_animations.cc
diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc
index f8a7e9e9bef15e53dfa6504c74bc2f24867d0169..f2e2aa2d6a460f834d91f9971533f1447f5c021c 100644
--- a/cc/animation/element_animations.cc
+++ b/cc/animation/element_animations.cc
@@ -373,7 +373,7 @@ void ElementAnimations::UpdateActivation(ActivationType type) {
}
}
- if (is_active_ && (!was_active || force)) {
+ if (is_active_ && (!was_active || force) && has_element_in_any_list()) {
loyso (OOO) 2016/11/28 04:27:04 Sohuldn't it be simple with a semantics similar to
junchao.han 2016/11/28 07:27:45 for 2 unit tests failed in patch set 3, UpdateActi
animation_host_->DidActivateElementAnimations(this);
} else if (!is_active_ && (was_active || force)) {
// Resetting last_tick_time_ here ensures that calling ::UpdateState
« no previous file with comments | « no previous file | cc/animation/element_animations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698