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

Unified Diff: cc/animation/animation_player.h

Issue 2349643003: CC Animation: Extract PropertyAnimationState as a non-nested struct. (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/animation_player.h
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h
index 6e75399c9ad2f2abf67f77af268feca5a9283218..491f6fdf5cb88b915f93dc90e59246fb3c209809 100644
--- a/cc/animation/animation_player.h
+++ b/cc/animation/animation_player.h
@@ -23,6 +23,7 @@ class AnimationDelegate;
class AnimationEvents;
class AnimationHost;
class AnimationTimeline;
+struct PropertyAnimationState;
// An AnimationPlayer owns all animations to be run on particular CC Layer.
// Multiple AnimationPlayers can be attached to one layer. In this case,
@@ -94,9 +95,6 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer> {
bool HasNonDeletedAnimation() const;
- using Animations = std::vector<std::unique_ptr<Animation>>;
- const Animations& animations() const { return animations_; }
-
bool needs_to_start_animations() const { return needs_to_start_animations_; }
void StartAnimations(base::TimeTicks monotonic_time);
@@ -154,6 +152,9 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer> {
// Returns the active animation for the given unique animation id.
Animation* GetAnimationById(int animation_id) const;
+ void GetPropertyAnimationStateFor(TargetProperty::Type property,
+ PropertyAnimationState* state) const;
+
private:
friend class base::RefCounted<AnimationPlayer>;
@@ -183,6 +184,7 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer> {
AnimationPlayer* animation_player_impl) const;
void PushPropertiesToImplThread(AnimationPlayer* animation_player_impl);
+ using Animations = std::vector<std::unique_ptr<Animation>>;
Animations animations_;
AnimationHost* animation_host_;

Powered by Google App Engine
This is Rietveld 408576698