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

Unified Diff: ui/compositor/transform_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
Index: ui/compositor/transform_animation_curve_adapter.cc
diff --git a/ui/compositor/transform_animation_curve_adapter.cc b/ui/compositor/transform_animation_curve_adapter.cc
index 2fa941eb6c79861e1f20ff4d79c2af5ae59acc27..49feb6af746113450c6a60c3bd5c41c75c2540e0 100644
--- a/ui/compositor/transform_animation_curve_adapter.cc
+++ b/ui/compositor/transform_animation_curve_adapter.cc
@@ -7,7 +7,7 @@
namespace ui {
TransformAnimationCurveAdapter::TransformAnimationCurveAdapter(
- Tween::Type tween_type,
+ gfx::Tween::Type tween_type,
gfx::Transform initial_value,
gfx::Transform target_value,
base::TimeDelta duration)
@@ -47,7 +47,8 @@ gfx::Transform TransformAnimationCurveAdapter::GetValue(
gfx::BlendDecomposedTransforms(&to_return,
decomposed_target_value_,
decomposed_initial_value_,
- Tween::CalculateValue(tween_type_, progress));
+ gfx::Tween::CalculateValue(tween_type_,
+ progress));
return gfx::ComposeTransform(to_return);
}
« 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