gfx::Transform API clean-up

ui/gfx/interpolated_transform_unittest.cc

Index: ui/gfx/interpolated_transform_unittest.cc
diff --git a/ui/gfx/interpolated_transform_unittest.cc b/ui/gfx/interpolated_transform_unittest.cc
index 65c5e2c8d7d3af30b84d2e93e508cd0eb1df47af..dd31b8b5e2f267edff2c771e5198099df1b56edf 100644
--- a/ui/gfx/interpolated_transform_unittest.cc
+++ b/ui/gfx/interpolated_transform_unittest.cc
@@ -38,7 +38,7 @@ TEST(InterpolatedTransformTest, InterpolatedRotation) {
 
   for (int i = 0; i <= 100; ++i) {
     gfx::Transform rotation;
-    rotation.SetRotate(i);
+    rotation.Rotate(i);
     gfx::Transform interpolated = interpolated_rotation.Interpolate(i / 100.0f);
     CheckApproximatelyEqual(rotation, interpolated);
     interpolated = interpolated_rotation_diff_start_end.Interpolate(i + 100);
@@ -54,7 +54,7 @@ TEST(InterpolatedTransformTest, InterpolatedScale) {
 
   for (int i = 0; i <= 100; ++i) {
     gfx::Transform scale;
-    scale.SetScale(i, i);
+    scale.Scale(i, i);
     gfx::Transform interpolated = interpolated_scale.Interpolate(i / 100.0f);
     CheckApproximatelyEqual(scale, interpolated);
     interpolated = interpolated_scale_diff_start_end.Interpolate(i + 100);
@@ -71,7 +71,7 @@ TEST(InterpolatedTransformTest, InterpolatedTranslate) {
 
   for (int i = 0; i <= 100; ++i) {
     gfx::Transform xform;
-    xform.SetTranslate(i, i);
+    xform.Translate(i, i);
     gfx::Transform interpolated = interpolated_xform.Interpolate(i / 100.0f);
     CheckApproximatelyEqual(xform, interpolated);
     interpolated = interpolated_xform_diff_start_end.Interpolate(i + 100);
@@ -114,31 +114,6 @@ TEST(InterpolatedTransformTest, InterpolatedScaleAboutPivot) {
   EXPECT_EQ(expected_result, above_pivot);
 }
 
-TEST(InterpolatedTransformTest, FactorTRS) {

[danakj, 2012/11/16 19:46:12]

Can you point me at the test that replaces this?

[Ian Vollick, 2012/11/16 21:51:24]

This test did still seem useful, so I've ported it and put it in
transform_unittest.

-  for (int degrees = 0; degrees < 360; ++degrees) {
-    // build a transformation matrix.
-    gfx::Transform transform;
-    transform.SetScale(degrees + 1, 2 * degrees + 1);
-    transform.ConcatRotate(degrees);
-    transform.ConcatTranslate(degrees * 2, -degrees * 3);
-
-    // factor the matrix
-    gfx::Point translation;
-    float rotation;
-    gfx::Point3F scale;
-    bool success = ui::InterpolatedTransform::FactorTRS(transform,
-                                                        &translation,
-                                                        &rotation,
-                                                        &scale);
-    EXPECT_TRUE(success);
-    EXPECT_FLOAT_EQ(translation.x(), degrees * 2);
-    EXPECT_FLOAT_EQ(translation.y(), -degrees * 3);
-    EXPECT_FLOAT_EQ(NormalizeAngle(rotation), degrees);
-    EXPECT_FLOAT_EQ(scale.x(), degrees + 1);
-    EXPECT_FLOAT_EQ(scale.y(), 2 * degrees + 1);
-  }
-}
-
 ui::InterpolatedTransform* GetScreenRotation(int degrees, bool reversed) {
   gfx::Point old_pivot;
   gfx::Point new_pivot;
@@ -257,4 +232,3 @@ TEST(InterpolatedTransformTest, MaximizeEndsCleanly) {
     }
   }
 }
-