| 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_TIMING_FUNCTION_H_ | 5 #ifndef CC_ANIMATION_TIMING_FUNCTION_H_ |
| 6 #define CC_ANIMATION_TIMING_FUNCTION_H_ | 6 #define CC_ANIMATION_TIMING_FUNCTION_H_ |
| 7 | 7 |
| 8 #include "cc/animation/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" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 double x2, double y2); | 32 double x2, double y2); |
| 33 virtual ~CubicBezierTimingFunction(); | 33 virtual ~CubicBezierTimingFunction(); |
| 34 | 34 |
| 35 // Partial implementation of FloatAnimationCurve. | 35 // Partial implementation of FloatAnimationCurve. |
| 36 virtual float GetValue(double time) const OVERRIDE; | 36 virtual float GetValue(double time) const OVERRIDE; |
| 37 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; | 37 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
| 38 | 38 |
| 39 protected: | 39 protected: |
| 40 CubicBezierTimingFunction(double x1, double y1, double x2, double y2); | 40 CubicBezierTimingFunction(double x1, double y1, double x2, double y2); |
| 41 | 41 |
| 42 SkScalar x1_; | 42 double x1_; |
| 43 SkScalar y1_; | 43 double y1_; |
| 44 SkScalar x2_; | 44 double x2_; |
| 45 SkScalar y2_; | 45 double y2_; |
| 46 | 46 |
| 47 private: | 47 private: |
| 48 DISALLOW_ASSIGN(CubicBezierTimingFunction); | 48 DISALLOW_ASSIGN(CubicBezierTimingFunction); |
| 49 }; | 49 }; |
| 50 | 50 |
| 51 class CC_EXPORT EaseTimingFunction { | 51 class CC_EXPORT EaseTimingFunction { |
| 52 public: | 52 public: |
| 53 static scoped_ptr<TimingFunction> Create(); | 53 static scoped_ptr<TimingFunction> Create(); |
| 54 | 54 |
| 55 private: | 55 private: |
| (...skipping 20 matching lines...) Expand all Loading... |
| 76 public: | 76 public: |
| 77 static scoped_ptr<TimingFunction> Create(); | 77 static scoped_ptr<TimingFunction> Create(); |
| 78 | 78 |
| 79 private: | 79 private: |
| 80 DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction); | 80 DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 } // namespace cc | 83 } // namespace cc |
| 84 | 84 |
| 85 #endif // CC_ANIMATION_TIMING_FUNCTION_H_ | 85 #endif // CC_ANIMATION_TIMING_FUNCTION_H_ |
| OLD | NEW |