| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_PROPERTY_ANIMATION_STATE_H_ | 5 #ifndef CC_TREES_PROPERTY_ANIMATION_STATE_H_ |
| 6 #define CC_ANIMATION_PROPERTY_ANIMATION_STATE_H_ | 6 #define CC_TREES_PROPERTY_ANIMATION_STATE_H_ |
| 7 | 7 |
| 8 #include "cc/animation/target_property.h" | |
| 9 #include "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
| 9 #include "cc/trees/target_property.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 | 12 |
| 13 struct CC_EXPORT PropertyAnimationState { | 13 struct CC_EXPORT PropertyAnimationState { |
| 14 PropertyAnimationState(); | 14 PropertyAnimationState(); |
| 15 PropertyAnimationState(const PropertyAnimationState& rhs); | 15 PropertyAnimationState(const PropertyAnimationState& rhs); |
| 16 ~PropertyAnimationState(); | 16 ~PropertyAnimationState(); |
| 17 | 17 |
| 18 TargetProperties currently_running; | 18 TargetProperties currently_running; |
| 19 TargetProperties potentially_animating; | 19 TargetProperties potentially_animating; |
| 20 | 20 |
| 21 bool operator==(const PropertyAnimationState& other) const; | 21 bool operator==(const PropertyAnimationState& other) const; |
| 22 bool operator!=(const PropertyAnimationState& other) const; | 22 bool operator!=(const PropertyAnimationState& other) const; |
| 23 | 23 |
| 24 PropertyAnimationState& operator|=(const PropertyAnimationState& other); | 24 PropertyAnimationState& operator|=(const PropertyAnimationState& other); |
| 25 PropertyAnimationState& operator^=(const PropertyAnimationState& other); | 25 PropertyAnimationState& operator^=(const PropertyAnimationState& other); |
| 26 PropertyAnimationState& operator&=(const PropertyAnimationState& other); | 26 PropertyAnimationState& operator&=(const PropertyAnimationState& other); |
| 27 | 27 |
| 28 bool IsValid() const; | 28 bool IsValid() const; |
| 29 | 29 |
| 30 void Clear(); | 30 void Clear(); |
| 31 }; | 31 }; |
| 32 | 32 |
| 33 PropertyAnimationState operator^(const PropertyAnimationState& lhs, | 33 PropertyAnimationState operator^(const PropertyAnimationState& lhs, |
| 34 const PropertyAnimationState& rhs); | 34 const PropertyAnimationState& rhs); |
| 35 | 35 |
| 36 } // namespace cc | 36 } // namespace cc |
| 37 | 37 |
| 38 #endif // CC_ANIMATION_PROPERTY_ANIMATION_STATE_H_ | 38 #endif // CC_TREES_PROPERTY_ANIMATION_STATE_H_ |
| OLD | NEW |