| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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_KEYFRAMED_ANIMATION_CURVE_H_ | 5 #ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| 6 #define CC_KEYFRAMED_ANIMATION_CURVE_H_ | 6 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| 7 | 7 |
| 8 #include "cc/animation_curve.h" | 8 #include "cc/animation/animation_curve.h" |
| 9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 10 #include "cc/base/scoped_ptr_vector.h" | 10 #include "cc/base/scoped_ptr_vector.h" |
| 11 #include "cc/timing_function.h" | 11 #include "cc/timing_function.h" |
| 12 #include "cc/transform_operations.h" | 12 #include "cc/transform_operations.h" |
| 13 | 13 |
| 14 namespace cc { | 14 namespace cc { |
| 15 | 15 |
| 16 class CC_EXPORT Keyframe { | 16 class CC_EXPORT Keyframe { |
| 17 public: | 17 public: |
| 18 double Time() const; | 18 double Time() const; |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 119 |
| 120 // Always sorted in order of increasing time. No two keyframes have the | 120 // Always sorted in order of increasing time. No two keyframes have the |
| 121 // same time. | 121 // same time. |
| 122 ScopedPtrVector<TransformKeyframe> keyframes_; | 122 ScopedPtrVector<TransformKeyframe> keyframes_; |
| 123 | 123 |
| 124 DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve); | 124 DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve); |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 } // namespace cc | 127 } // namespace cc |
| 128 | 128 |
| 129 #endif // CC_KEYFRAMED_ANIMATION_CURVE_H_ | 129 #endif // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| OLD | NEW |