| 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_TIMING_FUNCTION_H_ | 5 #ifndef CC_TIMING_FUNCTION_H_ |
| 6 #define CC_TIMING_FUNCTION_H_ | 6 #define CC_TIMING_FUNCTION_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 "third_party/skia/include/core/SkScalar.h" | 10 #include "third_party/skia/include/core/SkScalar.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 | 13 |
| 14 // See http://www.w3.org/TR/css3-transitions/. | 14 // See http://www.w3.org/TR/css3-transitions/. |
| 15 class CC_EXPORT TimingFunction : public FloatAnimationCurve { | 15 class CC_EXPORT TimingFunction : public FloatAnimationCurve { |
| 16 public: | 16 public: |
| 17 virtual ~TimingFunction(); | 17 virtual ~TimingFunction(); |
| 18 | 18 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 class CC_EXPORT EaseInOutTimingFunction { | 60 class CC_EXPORT EaseInOutTimingFunction { |
| 61 public: | 61 public: |
| 62 static scoped_ptr<TimingFunction> create(); | 62 static scoped_ptr<TimingFunction> create(); |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 } // namespace cc | 65 } // namespace cc |
| 66 | 66 |
| 67 #endif // CC_TIMING_FUNCTION_H_ | 67 #endif // CC_TIMING_FUNCTION_H_ |
| OLD | NEW |