| 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_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ | 5 #ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| 6 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ | 6 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 11 #include "cc/animation/animation_curve.h" | 12 #include "cc/animation/animation_curve.h" |
| 12 #include "cc/animation/timing_function.h" | 13 #include "cc/animation/timing_function.h" |
| 13 #include "cc/animation/transform_operations.h" | 14 #include "cc/animation/transform_operations.h" |
| 14 #include "cc/base/cc_export.h" | 15 #include "cc/base/cc_export.h" |
| 15 | 16 |
| 16 namespace cc { | 17 namespace cc { |
| 17 | 18 |
| 18 class CC_EXPORT Keyframe { | 19 class CC_EXPORT Keyframe { |
| 19 public: | 20 public: |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 // same time. | 242 // same time. |
| 242 std::vector<scoped_ptr<FilterKeyframe>> keyframes_; | 243 std::vector<scoped_ptr<FilterKeyframe>> keyframes_; |
| 243 scoped_ptr<TimingFunction> timing_function_; | 244 scoped_ptr<TimingFunction> timing_function_; |
| 244 | 245 |
| 245 DISALLOW_COPY_AND_ASSIGN(KeyframedFilterAnimationCurve); | 246 DISALLOW_COPY_AND_ASSIGN(KeyframedFilterAnimationCurve); |
| 246 }; | 247 }; |
| 247 | 248 |
| 248 } // namespace cc | 249 } // namespace cc |
| 249 | 250 |
| 250 #endif // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ | 251 #endif // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_ |
| OLD | NEW |