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

Unified Diff: cc/animation/animation_player.h

Issue 2554773002: CC Animation: Rename Active Players to Ticking Players. (Closed)
Patch Set: Rename the argument. Created 4 years 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_host.cc ('k') | cc/animation/animation_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_player.h
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h
index 62c9d54b2b2412a8886e538fcfce249a945a3178..174c6bc85e17aa0a95433208a1afbe9515ca0c28 100644
--- a/cc/animation/animation_player.h
+++ b/cc/animation/animation_player.h
@@ -76,11 +76,11 @@ class CC_ANIMATION_EXPORT AnimationPlayer
void PushPropertiesTo(AnimationPlayer* player_impl);
- void Animate(base::TimeTicks monotonic_time);
+ void Tick(base::TimeTicks monotonic_time);
void UpdateState(bool start_ready_animations, AnimationEvents* events);
- void UpdateActivation(ActivationType type);
- void Deactivate();
+ void UpdateTickingState(UpdateTickingType type);
+ void RemoveFromTicking();
// AnimationDelegate routing.
bool NotifyAnimationStarted(const AnimationEvent& event);
@@ -92,7 +92,7 @@ class CC_ANIMATION_EXPORT AnimationPlayer
// Returns true if there are any animations that have neither finished nor
// aborted.
- bool HasActiveAnimation() const;
+ bool HasTickingAnimation() const;
// Returns true if there are any animations at all to process.
bool has_any_animation() const { return !animations_.empty(); }
@@ -149,11 +149,11 @@ class CC_ANIMATION_EXPORT AnimationPlayer
bool HasElementInActiveList() const;
gfx::ScrollOffset ScrollOffsetForAnimation() const;
- // Returns the active animation animating the given property that is either
+ // Returns the animation animating the given property that is either
// running, or is next to run, if such an animation exists.
Animation* GetAnimation(TargetProperty::Type target_property) const;
- // Returns the active animation for the given unique animation id.
+ // Returns animation for the given unique animation id.
Animation* GetAnimationById(int animation_id) const;
void GetPropertyAnimationState(PropertyAnimationState* pending_state,
@@ -214,7 +214,7 @@ class CC_ANIMATION_EXPORT AnimationPlayer
bool needs_to_start_animations_;
// This is used to ensure that we don't spam the animation host.
- bool is_active_;
+ bool is_ticking_;
bool scroll_offset_animation_was_interrupted_;
« no previous file with comments | « cc/animation/animation_host.cc ('k') | cc/animation/animation_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698