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

Unified Diff: ui/base/animation/tween.cc

Issue 11087093: Migrate ui::Transform to gfx::Transform (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Should pass trybots this time Created 8 years, 2 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/base/animation/tween.h ('k') | ui/base/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/base/animation/tween.h ('k') | ui/base/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698