| 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);
|
| }
|
|
|
|
|