OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CC_ANIMATION_ANIMATION_PLAYER_H_ | 5 #ifndef CC_ANIMATION_ANIMATION_PLAYER_H_ |
6 #define CC_ANIMATION_ANIMATION_PLAYER_H_ | 6 #define CC_ANIMATION_ANIMATION_PLAYER_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/containers/linked_list.h" | 10 #include "base/containers/linked_list.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 void set_layer_animation_delegate(AnimationDelegate* delegate) { | 60 void set_layer_animation_delegate(AnimationDelegate* delegate) { |
61 layer_animation_delegate_ = delegate; | 61 layer_animation_delegate_ = delegate; |
62 } | 62 } |
63 | 63 |
64 void AttachLayer(int layer_id); | 64 void AttachLayer(int layer_id); |
65 void DetachLayer(); | 65 void DetachLayer(); |
66 | 66 |
67 void AddAnimation(scoped_ptr<Animation> animation); | 67 void AddAnimation(scoped_ptr<Animation> animation); |
68 void PauseAnimation(int animation_id, double time_offset); | 68 void PauseAnimation(int animation_id, double time_offset); |
69 void RemoveAnimation(int animation_id); | 69 void RemoveAnimation(int animation_id); |
| 70 void AbortAnimation(int animation_id); |
70 | 71 |
71 void PushPropertiesTo(AnimationPlayer* player_impl); | 72 void PushPropertiesTo(AnimationPlayer* player_impl); |
72 | 73 |
73 // AnimationDelegate routing. | 74 // AnimationDelegate routing. |
74 void NotifyAnimationStarted(base::TimeTicks monotonic_time, | 75 void NotifyAnimationStarted(base::TimeTicks monotonic_time, |
75 Animation::TargetProperty target_property, | 76 Animation::TargetProperty target_property, |
76 int group); | 77 int group); |
77 void NotifyAnimationFinished(base::TimeTicks monotonic_time, | 78 void NotifyAnimationFinished(base::TimeTicks monotonic_time, |
78 Animation::TargetProperty target_property, | 79 Animation::TargetProperty target_property, |
79 int group); | 80 int group); |
(...skipping 25 matching lines...) Expand all Loading... |
105 | 106 |
106 int id_; | 107 int id_; |
107 int layer_id_; | 108 int layer_id_; |
108 | 109 |
109 DISALLOW_COPY_AND_ASSIGN(AnimationPlayer); | 110 DISALLOW_COPY_AND_ASSIGN(AnimationPlayer); |
110 }; | 111 }; |
111 | 112 |
112 } // namespace cc | 113 } // namespace cc |
113 | 114 |
114 #endif // CC_ANIMATION_ANIMATION_PLAYER_H_ | 115 #endif // CC_ANIMATION_ANIMATION_PLAYER_H_ |
OLD | NEW |