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

Unified Diff: cc/animation/layer_animation_controller.h

Issue 68503014: cc: Alow animations to be aborted from either thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typo in MarkAnimationsForDeletion Created 7 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 | « cc/animation/animation_events.h ('k') | cc/animation/layer_animation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/layer_animation_controller.h
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 3260fe7b614cc077985706e257bb4995956f8154..d48951f2dd6da3fd640abcb350372d3b483257d0 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -38,16 +38,16 @@ class CC_EXPORT LayerAnimationController
int id() const { return id_; }
- // These methods are virtual for testing.
- virtual void AddAnimation(scoped_ptr<Animation> animation);
- virtual void PauseAnimation(int animation_id, double time_offset);
- virtual void RemoveAnimation(int animation_id);
- virtual void RemoveAnimation(int animation_id,
- Animation::TargetProperty target_property);
+ void AddAnimation(scoped_ptr<Animation> animation);
+ void PauseAnimation(int animation_id, double time_offset);
+ void RemoveAnimation(int animation_id);
+ void RemoveAnimation(int animation_id,
+ Animation::TargetProperty target_property);
+ void AbortAnimations(Animation::TargetProperty target_property);
// Ensures that the list of active animations on the main thread and the impl
// thread are kept in sync. This function does not take ownership of the impl
- // thread controller.
+ // thread controller. This method is virtual for testing.
virtual void PushAnimationUpdatesTo(
LayerAnimationController* controller_impl);
@@ -90,6 +90,7 @@ class CC_EXPORT LayerAnimationController
double wall_clock_time);
void NotifyAnimationFinished(const AnimationEvent& event,
double wall_clock_time);
+ void NotifyAnimationAborted(const AnimationEvent& event);
void NotifyAnimationPropertyUpdate(const AnimationEvent& event);
void AddValueObserver(LayerAnimationValueObserver* observer);
« no previous file with comments | « cc/animation/animation_events.h ('k') | cc/animation/layer_animation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698