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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/compositor/test/test_suite.h ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/compositor/compositor_export.h" 10 #include "ui/compositor/compositor_export.h"
11 #include "ui/gfx/animation/tween.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(gfx::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 virtual bool AffectsScale() const OVERRIDE; 33 virtual bool AffectsScale() const override;
34 virtual bool IsTranslation() const OVERRIDE; 34 virtual bool IsTranslation() const override;
35 virtual bool MaximumScale(float* max_scale) const OVERRIDE; 35 virtual bool MaximumScale(float* max_scale) const override;
36 36
37 private: 37 private:
38 gfx::Tween::Type tween_type_; 38 gfx::Tween::Type tween_type_;
39 gfx::Transform initial_value_; 39 gfx::Transform initial_value_;
40 gfx::Transform target_value_; 40 gfx::Transform target_value_;
41 gfx::DecomposedTransform decomposed_initial_value_; 41 gfx::DecomposedTransform decomposed_initial_value_;
42 gfx::DecomposedTransform decomposed_target_value_; 42 gfx::DecomposedTransform decomposed_target_value_;
43 base::TimeDelta duration_; 43 base::TimeDelta duration_;
44 44
45 DISALLOW_ASSIGN(TransformAnimationCurveAdapter); 45 DISALLOW_ASSIGN(TransformAnimationCurveAdapter);
46 }; 46 };
47 47
48 class COMPOSITOR_EXPORT InverseTransformCurveAdapter 48 class COMPOSITOR_EXPORT InverseTransformCurveAdapter
49 : public cc::TransformAnimationCurve { 49 : public cc::TransformAnimationCurve {
50 public: 50 public:
51 InverseTransformCurveAdapter(TransformAnimationCurveAdapter base_curve, 51 InverseTransformCurveAdapter(TransformAnimationCurveAdapter base_curve,
52 gfx::Transform initial_value, 52 gfx::Transform initial_value,
53 base::TimeDelta duration); 53 base::TimeDelta duration);
54 54
55 virtual ~InverseTransformCurveAdapter(); 55 virtual ~InverseTransformCurveAdapter();
56 56
57 virtual double Duration() const OVERRIDE; 57 virtual double Duration() const override;
58 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; 58 virtual scoped_ptr<AnimationCurve> Clone() const override;
59 virtual gfx::Transform GetValue(double t) const OVERRIDE; 59 virtual gfx::Transform GetValue(double t) const override;
60 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, 60 virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
61 gfx::BoxF* bounds) const OVERRIDE; 61 gfx::BoxF* bounds) const override;
62 virtual bool AffectsScale() const OVERRIDE; 62 virtual bool AffectsScale() const override;
63 virtual bool IsTranslation() const OVERRIDE; 63 virtual bool IsTranslation() const override;
64 virtual bool MaximumScale(float* max_scale) const OVERRIDE; 64 virtual bool MaximumScale(float* max_scale) const override;
65 65
66 private: 66 private:
67 TransformAnimationCurveAdapter base_curve_; 67 TransformAnimationCurveAdapter base_curve_;
68 gfx::Transform initial_value_; 68 gfx::Transform initial_value_;
69 gfx::Transform effective_initial_value_; 69 gfx::Transform effective_initial_value_;
70 base::TimeDelta duration_; 70 base::TimeDelta duration_;
71 71
72 DISALLOW_ASSIGN(InverseTransformCurveAdapter); 72 DISALLOW_ASSIGN(InverseTransformCurveAdapter);
73 }; 73 };
74 74
75 } // namespace ui 75 } // namespace ui
76 76
77 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ 77 #endif // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
78 78
OLDNEW
« no previous file with comments | « ui/compositor/test/test_suite.h ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698