| Index: ui/base/animation/tween.cc
|
| diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc
|
| index 18a21b8f1696a2d98145aa8a7a0728e910661e05..3c81ca199b2a18055b370dec31963c95d3c34bfc 100644
|
| --- a/ui/base/animation/tween.cc
|
| +++ b/ui/base/animation/tween.cc
|
| @@ -96,15 +96,15 @@ gfx::Rect Tween::ValueBetween(double value,
|
| }
|
|
|
| // static
|
| -Transform Tween::ValueBetween(double value,
|
| - const Transform& start_transform,
|
| - const Transform& end_transform) {
|
| +gfx::Transform Tween::ValueBetween(double value,
|
| + const gfx::Transform& start_transform,
|
| + const gfx::Transform& end_transform) {
|
| if (value >= 1.0)
|
| return end_transform;
|
| if (value <= 0.0)
|
| return start_transform;
|
|
|
| - Transform to_return;
|
| + gfx::Transform to_return;
|
| gfx::Point start_translation, end_translation;
|
| float start_rotation, end_rotation;
|
| gfx::Point3f start_scale, end_scale;
|
|
|