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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.h ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/float_animation_curve_adapter.cc
diff --git a/ui/compositor/float_animation_curve_adapter.cc b/ui/compositor/float_animation_curve_adapter.cc
index e97fbf0b700066868acd66ecd68102ab35f3e0ad..ec41f964d9197d976aeec4d63b92fc53fa54d5dd 100644
--- a/ui/compositor/float_animation_curve_adapter.cc
+++ b/ui/compositor/float_animation_curve_adapter.cc
@@ -7,7 +7,7 @@
namespace ui {
FloatAnimationCurveAdapter::FloatAnimationCurveAdapter(
- Tween::Type tween_type,
+ gfx::Tween::Type tween_type,
float initial_value,
float target_value,
base::TimeDelta duration)
@@ -36,9 +36,10 @@ float FloatAnimationCurveAdapter::GetValue(double t) const {
if (t <= 0.0)
return initial_value_;
double progress = t / duration_.InSecondsF();
- return Tween::ValueBetween(Tween::CalculateValue(tween_type_, progress),
- initial_value_,
- target_value_);
+ return gfx::Tween::ValueBetween(
+ gfx::Tween::CalculateValue(tween_type_, progress),
+ initial_value_,
+ target_value_);
}
} // namespace ui
« 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