| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ | 5 #ifndef UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ |
| 6 #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ | 6 #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ |
| 7 | 7 |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "cc/animation/animation_curve.h" | 9 #include "cc/animation/animation_curve.h" |
| 10 #include "ui/base/animation/tween.h" | |
| 11 #include "ui/compositor/compositor_export.h" | 10 #include "ui/compositor/compositor_export.h" |
| 11 #include "ui/gfx/animation/tween.h" |
| 12 #include "ui/gfx/transform.h" | 12 #include "ui/gfx/transform.h" |
| 13 #include "ui/gfx/transform_util.h" | 13 #include "ui/gfx/transform_util.h" |
| 14 | 14 |
| 15 namespace ui { | 15 namespace ui { |
| 16 | 16 |
| 17 class COMPOSITOR_EXPORT TransformAnimationCurveAdapter | 17 class COMPOSITOR_EXPORT TransformAnimationCurveAdapter |
| 18 : public cc::TransformAnimationCurve { | 18 : public cc::TransformAnimationCurve { |
| 19 public: | 19 public: |
| 20 TransformAnimationCurveAdapter(Tween::Type tween_type, | 20 TransformAnimationCurveAdapter(gfx::Tween::Type tween_type, |
| 21 gfx::Transform intial_value, | 21 gfx::Transform intial_value, |
| 22 gfx::Transform target_value, | 22 gfx::Transform target_value, |
| 23 base::TimeDelta duration); | 23 base::TimeDelta duration); |
| 24 | 24 |
| 25 virtual ~TransformAnimationCurveAdapter(); | 25 virtual ~TransformAnimationCurveAdapter(); |
| 26 | 26 |
| 27 // TransformAnimationCurve implementation. | 27 // TransformAnimationCurve implementation. |
| 28 virtual double Duration() const OVERRIDE; | 28 virtual double Duration() const OVERRIDE; |
| 29 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; | 29 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
| 30 virtual gfx::Transform GetValue(double t) const OVERRIDE; | 30 virtual gfx::Transform GetValue(double t) const OVERRIDE; |
| 31 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, | 31 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, |
| 32 gfx::BoxF* bounds) const OVERRIDE; | 32 gfx::BoxF* bounds) const OVERRIDE; |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 Tween::Type tween_type_; | 35 gfx::Tween::Type tween_type_; |
| 36 gfx::Transform initial_value_; | 36 gfx::Transform initial_value_; |
| 37 gfx::Transform target_value_; | 37 gfx::Transform target_value_; |
| 38 gfx::DecomposedTransform decomposed_initial_value_; | 38 gfx::DecomposedTransform decomposed_initial_value_; |
| 39 gfx::DecomposedTransform decomposed_target_value_; | 39 gfx::DecomposedTransform decomposed_target_value_; |
| 40 base::TimeDelta duration_; | 40 base::TimeDelta duration_; |
| 41 | 41 |
| 42 DISALLOW_ASSIGN(TransformAnimationCurveAdapter); | 42 DISALLOW_ASSIGN(TransformAnimationCurveAdapter); |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 class COMPOSITOR_EXPORT InverseTransformCurveAdapter | 45 class COMPOSITOR_EXPORT InverseTransformCurveAdapter |
| (...skipping 17 matching lines...) Expand all Loading... |
| 63 gfx::Transform effective_initial_value_; | 63 gfx::Transform effective_initial_value_; |
| 64 base::TimeDelta duration_; | 64 base::TimeDelta duration_; |
| 65 | 65 |
| 66 DISALLOW_ASSIGN(InverseTransformCurveAdapter); | 66 DISALLOW_ASSIGN(InverseTransformCurveAdapter); |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 } // namespace ui | 69 } // namespace ui |
| 70 | 70 |
| 71 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ | 71 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ |
| 72 | 72 |
| OLD | NEW |