| 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_ELEMENT_ANIMATIONS_H_ | 5 #ifndef CC_ANIMATION_ELEMENT_ANIMATIONS_H_ |
| 6 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_ | 6 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_ |
| 7 | 7 |
| 8 #include <bitset> | 8 #include <bitset> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 scoped_refptr<ElementAnimations> element_animations_impl); | 73 scoped_refptr<ElementAnimations> element_animations_impl); |
| 74 | 74 |
| 75 void AddAnimation(std::unique_ptr<Animation> animation); | 75 void AddAnimation(std::unique_ptr<Animation> animation); |
| 76 void PauseAnimation(int animation_id, base::TimeDelta time_offset); | 76 void PauseAnimation(int animation_id, base::TimeDelta time_offset); |
| 77 void RemoveAnimation(int animation_id); | 77 void RemoveAnimation(int animation_id); |
| 78 void AbortAnimation(int animation_id); | 78 void AbortAnimation(int animation_id); |
| 79 void AbortAnimations(TargetProperty::Type target_property, | 79 void AbortAnimations(TargetProperty::Type target_property, |
| 80 bool needs_completion = false); | 80 bool needs_completion = false); |
| 81 | 81 |
| 82 void Animate(base::TimeTicks monotonic_time); | 82 void Animate(base::TimeTicks monotonic_time); |
| 83 void AccumulatePropertyUpdates(base::TimeTicks monotonic_time, | |
| 84 AnimationEvents* events); | |
| 85 | 83 |
| 86 void UpdateState(bool start_ready_animations, AnimationEvents* events); | 84 void UpdateState(bool start_ready_animations, AnimationEvents* events); |
| 87 | 85 |
| 88 // Make animations affect active elements if and only if they affect | 86 // Make animations affect active elements if and only if they affect |
| 89 // pending elements. Any animations that no longer affect any elements | 87 // pending elements. Any animations that no longer affect any elements |
| 90 // are deleted. | 88 // are deleted. |
| 91 void ActivateAnimations(); | 89 void ActivateAnimations(); |
| 92 | 90 |
| 93 // Returns the active animation animating the given property that is either | 91 // Returns the active animation animating the given property that is either |
| 94 // running, or is next to run, if such an animation exists. | 92 // running, or is next to run, if such an animation exists. |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 293 |
| 296 struct PropertyAnimationState opacity_animation_state_; | 294 struct PropertyAnimationState opacity_animation_state_; |
| 297 struct PropertyAnimationState transform_animation_state_; | 295 struct PropertyAnimationState transform_animation_state_; |
| 298 | 296 |
| 299 DISALLOW_COPY_AND_ASSIGN(ElementAnimations); | 297 DISALLOW_COPY_AND_ASSIGN(ElementAnimations); |
| 300 }; | 298 }; |
| 301 | 299 |
| 302 } // namespace cc | 300 } // namespace cc |
| 303 | 301 |
| 304 #endif // CC_ANIMATION_ELEMENT_ANIMATIONS_H_ | 302 #endif // CC_ANIMATION_ELEMENT_ANIMATIONS_H_ |
| OLD | NEW |