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

Unified Diff: cc/animation/element_animations.h

Issue 2349643003: CC Animation: Extract PropertyAnimationState as a non-nested struct. (Closed)
Patch Set: Reparent to master to make it independent. Created 4 years, 2 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
« no previous file with comments | « cc/animation/animation_player.cc ('k') | cc/animation/element_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/element_animations.h
diff --git a/cc/animation/element_animations.h b/cc/animation/element_animations.h
index c345d09517cf9d583d6cbb445b6d70ab73923378..ce514ae63190dd0d34e200ff7e91b8c5656d5a68 100644
--- a/cc/animation/element_animations.h
+++ b/cc/animation/element_animations.h
@@ -15,6 +15,7 @@
#include "cc/animation/animation.h"
#include "cc/animation/animation_curve.h"
#include "cc/animation/animation_events.h"
+#include "cc/animation/property_animation_state.h"
#include "cc/animation/target_property.h"
#include "cc/base/cc_export.h"
#include "ui/gfx/geometry/scroll_offset.h"
@@ -246,22 +247,9 @@ class CC_EXPORT ElementAnimations : public base::RefCounted<ElementAnimations> {
bool needs_push_properties_;
- struct PropertyAnimationState {
- bool currently_running_for_active_elements = false;
- bool currently_running_for_pending_elements = false;
- bool potentially_animating_for_active_elements = false;
- bool potentially_animating_for_pending_elements = false;
- void Clear() {
- currently_running_for_active_elements = false;
- currently_running_for_pending_elements = false;
- potentially_animating_for_active_elements = false;
- potentially_animating_for_pending_elements = false;
- }
- };
-
- struct PropertyAnimationState filter_animation_state_;
- struct PropertyAnimationState opacity_animation_state_;
- struct PropertyAnimationState transform_animation_state_;
+ PropertyAnimationState filter_animation_state_;
+ PropertyAnimationState opacity_animation_state_;
+ PropertyAnimationState transform_animation_state_;
bool needs_update_impl_client_state_transform_ : 1;
bool needs_update_impl_client_state_opacity_ : 1;
« no previous file with comments | « cc/animation/animation_player.cc ('k') | cc/animation/element_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698