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

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

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk 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
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.h ('k') | ui/compositor/layer.cc » ('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 #include "ui/compositor/float_animation_curve_adapter.h" 5 #include "ui/compositor/float_animation_curve_adapter.h"
6 6
7 namespace ui { 7 namespace ui {
8 8
9 FloatAnimationCurveAdapter::FloatAnimationCurveAdapter( 9 FloatAnimationCurveAdapter::FloatAnimationCurveAdapter(
10 Tween::Type tween_type, 10 gfx::Tween::Type tween_type,
11 float initial_value, 11 float initial_value,
12 float target_value, 12 float target_value,
13 base::TimeDelta duration) 13 base::TimeDelta duration)
14 : tween_type_(tween_type), 14 : tween_type_(tween_type),
15 initial_value_(initial_value), 15 initial_value_(initial_value),
16 target_value_(target_value), 16 target_value_(target_value),
17 duration_(duration) { 17 duration_(duration) {
18 } 18 }
19 19
20 double FloatAnimationCurveAdapter::Duration() const { 20 double FloatAnimationCurveAdapter::Duration() const {
21 return duration_.InSecondsF(); 21 return duration_.InSecondsF();
22 } 22 }
23 23
24 scoped_ptr<cc::AnimationCurve> FloatAnimationCurveAdapter::Clone() const { 24 scoped_ptr<cc::AnimationCurve> FloatAnimationCurveAdapter::Clone() const {
25 scoped_ptr<FloatAnimationCurveAdapter> to_return( 25 scoped_ptr<FloatAnimationCurveAdapter> to_return(
26 new FloatAnimationCurveAdapter(tween_type_, 26 new FloatAnimationCurveAdapter(tween_type_,
27 initial_value_, 27 initial_value_,
28 target_value_, 28 target_value_,
29 duration_)); 29 duration_));
30 return to_return.PassAs<cc::AnimationCurve>(); 30 return to_return.PassAs<cc::AnimationCurve>();
31 } 31 }
32 32
33 float FloatAnimationCurveAdapter::GetValue(double t) const { 33 float FloatAnimationCurveAdapter::GetValue(double t) const {
34 if (t >= duration_.InSecondsF()) 34 if (t >= duration_.InSecondsF())
35 return target_value_; 35 return target_value_;
36 if (t <= 0.0) 36 if (t <= 0.0)
37 return initial_value_; 37 return initial_value_;
38 double progress = t / duration_.InSecondsF(); 38 double progress = t / duration_.InSecondsF();
39 return Tween::ValueBetween(Tween::CalculateValue(tween_type_, progress), 39 return gfx::Tween::ValueBetween(
40 initial_value_, 40 gfx::Tween::CalculateValue(tween_type_, progress),
41 target_value_); 41 initial_value_,
42 target_value_);
42 } 43 }
43 44
44 } // namespace ui 45 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.h ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698