| Index: trunk/src/ui/compositor/transform_animation_curve_adapter.h
|
| ===================================================================
|
| --- trunk/src/ui/compositor/transform_animation_curve_adapter.h (revision 220491)
|
| +++ trunk/src/ui/compositor/transform_animation_curve_adapter.h (working copy)
|
| @@ -8,14 +8,12 @@
|
| #include "base/time/time.h"
|
| #include "cc/animation/animation_curve.h"
|
| #include "ui/base/animation/tween.h"
|
| -#include "ui/compositor/compositor_export.h"
|
| #include "ui/gfx/transform.h"
|
| #include "ui/gfx/transform_util.h"
|
|
|
| namespace ui {
|
|
|
| -class COMPOSITOR_EXPORT TransformAnimationCurveAdapter
|
| - : public cc::TransformAnimationCurve {
|
| +class TransformAnimationCurveAdapter :public cc::TransformAnimationCurve {
|
| public:
|
| TransformAnimationCurveAdapter(Tween::Type tween_type,
|
| gfx::Transform intial_value,
|
| @@ -38,34 +36,8 @@
|
| gfx::DecomposedTransform decomposed_initial_value_;
|
| gfx::DecomposedTransform decomposed_target_value_;
|
| base::TimeDelta duration_;
|
| -
|
| - DISALLOW_ASSIGN(TransformAnimationCurveAdapter);
|
| };
|
|
|
| -class COMPOSITOR_EXPORT InverseTransformCurveAdapter
|
| - : public cc::TransformAnimationCurve {
|
| - public:
|
| - InverseTransformCurveAdapter(TransformAnimationCurveAdapter base_curve,
|
| - gfx::Transform initial_value,
|
| - base::TimeDelta duration);
|
| -
|
| - virtual ~InverseTransformCurveAdapter();
|
| -
|
| - virtual double Duration() const OVERRIDE;
|
| - virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
|
| - virtual gfx::Transform GetValue(double t) const OVERRIDE;
|
| - virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
|
| - gfx::BoxF* bounds) const OVERRIDE;
|
| -
|
| - private:
|
| - TransformAnimationCurveAdapter base_curve_;
|
| - gfx::Transform initial_value_;
|
| - gfx::Transform effective_initial_value_;
|
| - base::TimeDelta duration_;
|
| -
|
| - DISALLOW_ASSIGN(InverseTransformCurveAdapter);
|
| -};
|
| -
|
| } // namespace ui
|
|
|
| #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
|
|
|