| 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_KEYFRAMED_ANIMATION_CURVE_H_ |
| 6 #define CC_KEYFRAMED_ANIMATION_CURVE_H_ | 6 #define CC_KEYFRAMED_ANIMATION_CURVE_H_ |
| 7 | 7 |
| 8 #include "cc/animation_curve.h" | 8 #include "cc/animation_curve.h" |
| 9 #include "cc/cc_export.h" | 9 #include "cc/cc_export.h" |
| 10 #include "cc/scoped_ptr_vector.h" | 10 #include "cc/scoped_ptr_vector.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 static scoped_ptr<TransformKeyframe> create(double time, const WebKit::WebTr
ansformOperations& value, scoped_ptr<TimingFunction>); | 49 static scoped_ptr<TransformKeyframe> create(double time, const WebKit::WebTr
ansformOperations& value, scoped_ptr<TimingFunction>); |
| 50 virtual ~TransformKeyframe(); | 50 virtual ~TransformKeyframe(); |
| 51 | 51 |
| 52 const WebKit::WebTransformOperations& value() const; | 52 const WebKit::WebTransformOperations& value() const; |
| 53 | 53 |
| 54 scoped_ptr<TransformKeyframe> clone() const; | 54 scoped_ptr<TransformKeyframe> clone() const; |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 TransformKeyframe(double time, const WebKit::WebTransformOperations& value,
scoped_ptr<TimingFunction>); | 57 TransformKeyframe(double time, const WebKit::WebTransformOperations& value,
scoped_ptr<TimingFunction>); |
| 58 | 58 |
| 59 WebKit::WebTransformOperations m_value; | 59 scoped_ptr<WebKit::WebTransformOperations> m_value; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { | 62 class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { |
| 63 public: | 63 public: |
| 64 // It is required that the keyframes be sorted by time. | 64 // It is required that the keyframes be sorted by time. |
| 65 static scoped_ptr<KeyframedFloatAnimationCurve> create(); | 65 static scoped_ptr<KeyframedFloatAnimationCurve> create(); |
| 66 | 66 |
| 67 virtual ~KeyframedFloatAnimationCurve(); | 67 virtual ~KeyframedFloatAnimationCurve(); |
| 68 | 68 |
| 69 void addKeyframe(scoped_ptr<FloatKeyframe>); | 69 void addKeyframe(scoped_ptr<FloatKeyframe>); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // Always sorted in order of increasing time. No two keyframes have the | 107 // Always sorted in order of increasing time. No two keyframes have the |
| 108 // same time. | 108 // same time. |
| 109 ScopedPtrVector<TransformKeyframe> m_keyframes; | 109 ScopedPtrVector<TransformKeyframe> m_keyframes; |
| 110 | 110 |
| 111 DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve); | 111 DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve); |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 } // namespace cc | 114 } // namespace cc |
| 115 | 115 |
| 116 #endif // CC_KEYFRAMED_ANIMATION_CURVE_H_ | 116 #endif // CC_KEYFRAMED_ANIMATION_CURVE_H_ |
| OLD | NEW |