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

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

Issue 719453007: Make Keyframe use TimeTicks/TimeDelta to represent time instead of double. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 #include "ui/compositor/transform_animation_curve_adapter.h" 5 #include "ui/compositor/transform_animation_curve_adapter.h"
6 6
7 #include "cc/base/time_util.h"
8
7 namespace ui { 9 namespace ui {
8 10
9 TransformAnimationCurveAdapter::TransformAnimationCurveAdapter( 11 TransformAnimationCurveAdapter::TransformAnimationCurveAdapter(
10 gfx::Tween::Type tween_type, 12 gfx::Tween::Type tween_type,
11 gfx::Transform initial_value, 13 gfx::Transform initial_value,
12 gfx::Transform target_value, 14 gfx::Transform target_value,
13 base::TimeDelta duration) 15 base::TimeDelta duration)
14 : tween_type_(tween_type), 16 : tween_type_(tween_type),
15 initial_value_(initial_value), 17 initial_value_(initial_value),
16 target_value_(target_value), 18 target_value_(target_value),
17 duration_(duration) { 19 duration_(duration) {
18 gfx::DecomposeTransform(&decomposed_initial_value_, initial_value_); 20 gfx::DecomposeTransform(&decomposed_initial_value_, initial_value_);
19 gfx::DecomposeTransform(&decomposed_target_value_, target_value_); 21 gfx::DecomposeTransform(&decomposed_target_value_, target_value_);
20 } 22 }
21 23
22 TransformAnimationCurveAdapter::~TransformAnimationCurveAdapter() { 24 TransformAnimationCurveAdapter::~TransformAnimationCurveAdapter() {
23 } 25 }
24 26
25 base::TimeDelta TransformAnimationCurveAdapter::Duration() const { 27 base::TimeDelta TransformAnimationCurveAdapter::Duration() const {
26 return duration_; 28 return duration_;
27 } 29 }
28 30
29 scoped_ptr<cc::AnimationCurve> TransformAnimationCurveAdapter::Clone() const { 31 scoped_ptr<cc::AnimationCurve> TransformAnimationCurveAdapter::Clone() const {
30 return make_scoped_ptr(new TransformAnimationCurveAdapter( 32 return make_scoped_ptr(new TransformAnimationCurveAdapter(
31 tween_type_, initial_value_, target_value_, duration_)); 33 tween_type_, initial_value_, target_value_, duration_));
32 } 34 }
33 35
34 gfx::Transform TransformAnimationCurveAdapter::GetValue( 36 gfx::Transform TransformAnimationCurveAdapter::GetValue(
35 double t) const { 37 base::TimeDelta t) const {
36 if (t >= duration_.InSecondsF()) 38 if (t >= duration_)
37 return target_value_; 39 return target_value_;
38 if (t <= 0.0) 40 if (t <= base::TimeDelta())
39 return initial_value_; 41 return initial_value_;
40 double progress = t / duration_.InSecondsF(); 42 double progress = cc::TimeUtil::Divide(t, duration_);
41 43
42 gfx::DecomposedTransform to_return; 44 gfx::DecomposedTransform to_return;
43 gfx::BlendDecomposedTransforms(&to_return, 45 gfx::BlendDecomposedTransforms(&to_return,
44 decomposed_target_value_, 46 decomposed_target_value_,
45 decomposed_initial_value_, 47 decomposed_initial_value_,
46 gfx::Tween::CalculateValue(tween_type_, 48 gfx::Tween::CalculateValue(tween_type_,
47 progress)); 49 progress));
48 return gfx::ComposeTransform(to_return); 50 return gfx::ComposeTransform(to_return);
49 } 51 }
50 52
(...skipping 22 matching lines...) Expand all
73 return false; 75 return false;
74 } 76 }
75 77
76 InverseTransformCurveAdapter::InverseTransformCurveAdapter( 78 InverseTransformCurveAdapter::InverseTransformCurveAdapter(
77 TransformAnimationCurveAdapter base_curve, 79 TransformAnimationCurveAdapter base_curve,
78 gfx::Transform initial_value, 80 gfx::Transform initial_value,
79 base::TimeDelta duration) 81 base::TimeDelta duration)
80 : base_curve_(base_curve), 82 : base_curve_(base_curve),
81 initial_value_(initial_value), 83 initial_value_(initial_value),
82 duration_(duration) { 84 duration_(duration) {
83 effective_initial_value_ = base_curve_.GetValue(0.0) * initial_value_; 85 effective_initial_value_ =
86 base_curve_.GetValue(base::TimeDelta()) * initial_value_;
84 } 87 }
85 88
86 InverseTransformCurveAdapter::~InverseTransformCurveAdapter() { 89 InverseTransformCurveAdapter::~InverseTransformCurveAdapter() {
87 } 90 }
88 91
89 base::TimeDelta InverseTransformCurveAdapter::Duration() const { 92 base::TimeDelta InverseTransformCurveAdapter::Duration() const {
90 return duration_; 93 return duration_;
91 } 94 }
92 95
93 scoped_ptr<cc::AnimationCurve> InverseTransformCurveAdapter::Clone() const { 96 scoped_ptr<cc::AnimationCurve> InverseTransformCurveAdapter::Clone() const {
94 return make_scoped_ptr( 97 return make_scoped_ptr(
95 new InverseTransformCurveAdapter(base_curve_, initial_value_, duration_)); 98 new InverseTransformCurveAdapter(base_curve_, initial_value_, duration_));
96 } 99 }
97 100
98 gfx::Transform InverseTransformCurveAdapter::GetValue( 101 gfx::Transform InverseTransformCurveAdapter::GetValue(base::TimeDelta t) const {
99 double t) const { 102 if (t <= base::TimeDelta())
100 if (t <= 0.0)
101 return initial_value_; 103 return initial_value_;
102 104
103 gfx::Transform base_transform = base_curve_.GetValue(t); 105 gfx::Transform base_transform = base_curve_.GetValue(t);
104 // Invert base 106 // Invert base
105 gfx::Transform to_return(gfx::Transform::kSkipInitialization); 107 gfx::Transform to_return(gfx::Transform::kSkipInitialization);
106 bool is_invertible = base_transform.GetInverse(&to_return); 108 bool is_invertible = base_transform.GetInverse(&to_return);
107 DCHECK(is_invertible); 109 DCHECK(is_invertible);
108 110
109 to_return.PreconcatTransform(effective_initial_value_); 111 to_return.PreconcatTransform(effective_initial_value_);
110 return to_return; 112 return to_return;
(...skipping 17 matching lines...) Expand all
128 return initial_value_.IsIdentityOrTranslation() && 130 return initial_value_.IsIdentityOrTranslation() &&
129 base_curve_.IsTranslation(); 131 base_curve_.IsTranslation();
130 } 132 }
131 133
132 bool InverseTransformCurveAdapter::MaximumTargetScale(bool forward_direction, 134 bool InverseTransformCurveAdapter::MaximumTargetScale(bool forward_direction,
133 float* max_scale) const { 135 float* max_scale) const {
134 return false; 136 return false;
135 } 137 }
136 138
137 } // namespace ui 139 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/transform_animation_curve_adapter.h ('k') | ui/compositor/transform_animation_curve_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698