Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Side by Side Diff: trunk/src/ui/compositor/transform_animation_curve_adapter.h

Issue 23809002: Revert 220479 "Add support for inverse transform animations." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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" 10 #include "ui/base/animation/tween.h"
11 #include "ui/compositor/compositor_export.h"
12 #include "ui/gfx/transform.h" 11 #include "ui/gfx/transform.h"
13 #include "ui/gfx/transform_util.h" 12 #include "ui/gfx/transform_util.h"
14 13
15 namespace ui { 14 namespace ui {
16 15
17 class COMPOSITOR_EXPORT TransformAnimationCurveAdapter 16 class TransformAnimationCurveAdapter :public cc::TransformAnimationCurve {
18 : public cc::TransformAnimationCurve {
19 public: 17 public:
20 TransformAnimationCurveAdapter(Tween::Type tween_type, 18 TransformAnimationCurveAdapter(Tween::Type tween_type,
21 gfx::Transform intial_value, 19 gfx::Transform intial_value,
22 gfx::Transform target_value, 20 gfx::Transform target_value,
23 base::TimeDelta duration); 21 base::TimeDelta duration);
24 22
25 virtual ~TransformAnimationCurveAdapter(); 23 virtual ~TransformAnimationCurveAdapter();
26 24
27 // TransformAnimationCurve implementation. 25 // TransformAnimationCurve implementation.
28 virtual double Duration() const OVERRIDE; 26 virtual double Duration() const OVERRIDE;
29 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; 27 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
30 virtual gfx::Transform GetValue(double t) const OVERRIDE; 28 virtual gfx::Transform GetValue(double t) const OVERRIDE;
31 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, 29 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
32 gfx::BoxF* bounds) const OVERRIDE; 30 gfx::BoxF* bounds) const OVERRIDE;
33 31
34 private: 32 private:
35 Tween::Type tween_type_; 33 Tween::Type tween_type_;
36 gfx::Transform initial_value_; 34 gfx::Transform initial_value_;
37 gfx::Transform target_value_; 35 gfx::Transform target_value_;
38 gfx::DecomposedTransform decomposed_initial_value_; 36 gfx::DecomposedTransform decomposed_initial_value_;
39 gfx::DecomposedTransform decomposed_target_value_; 37 gfx::DecomposedTransform decomposed_target_value_;
40 base::TimeDelta duration_; 38 base::TimeDelta duration_;
41
42 DISALLOW_ASSIGN(TransformAnimationCurveAdapter);
43 };
44
45 class COMPOSITOR_EXPORT InverseTransformCurveAdapter
46 : public cc::TransformAnimationCurve {
47 public:
48 InverseTransformCurveAdapter(TransformAnimationCurveAdapter base_curve,
49 gfx::Transform initial_value,
50 base::TimeDelta duration);
51
52 virtual ~InverseTransformCurveAdapter();
53
54 virtual double Duration() const OVERRIDE;
55 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
56 virtual gfx::Transform GetValue(double t) const OVERRIDE;
57 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
58 gfx::BoxF* bounds) const OVERRIDE;
59
60 private:
61 TransformAnimationCurveAdapter base_curve_;
62 gfx::Transform initial_value_;
63 gfx::Transform effective_initial_value_;
64 base::TimeDelta duration_;
65
66 DISALLOW_ASSIGN(InverseTransformCurveAdapter);
67 }; 39 };
68 40
69 } // namespace ui 41 } // namespace ui
70 42
71 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ 43 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
72 44
OLDNEW
« no previous file with comments | « trunk/src/ui/compositor/test/test_utils.cc ('k') | trunk/src/ui/compositor/transform_animation_curve_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698