gfx::Transform API clean-up

ui/aura/window_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 341 matching lines @@
   root->MoveCursorTo(gfx::Point(10, 10));
   EXPECT_TRUE(w_test_api.ContainsMouse());
   root->MoveCursorTo(gfx::Point(9, 10));
   EXPECT_FALSE(w_test_api.ContainsMouse());
 }
 
 // Test Window::ConvertPointToWindow() with transform to root_window.
 TEST_F(WindowTest, MoveCursorToWithTransformRootWindow) {
   RootWindow* root = root_window();
   gfx::Transform transform;
-  transform.ConcatScale(2, 5);
-  transform.ConcatRotate(90.0f);
-  transform.ConcatTranslate(100, 100);
+  transform.Translate(100.0, 100.0);
+  transform.Rotate(90.0);
+  transform.Scale(2.0, 5.0);
   root->SetTransform(transform);
   root->MoveCursorTo(gfx::Point(10, 10));
 #if !defined(OS_WIN)
   // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.OD
   EXPECT_EQ("50,120", root->QueryMouseLocationForTest().ToString());
 #endif
   EXPECT_EQ("10,10",
       gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
 }
 
 // Tests Window::ConvertPointToWindow() with transform to non-root windows.
 TEST_F(WindowTest, MoveCursorToWithTransformWindow) {
   scoped_ptr<Window> w1(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500), NULL));
 
   gfx::Transform transform1;
-  transform1.ConcatScale(2, 2);
+  transform1.Scale(2, 2);
   w1->SetTransform(transform1);
   w1->MoveCursorTo(gfx::Point(10, 10));
   EXPECT_EQ("30,30",
       gfx::Screen::GetScreenFor(w1.get())->GetCursorScreenPoint().ToString());
 
   gfx::Transform transform2;
-  transform2.ConcatTranslate(-10, 20);
+  transform2.Translate(-10, 20);
   w1->SetTransform(transform2);
   w1->MoveCursorTo(gfx::Point(10, 10));
   EXPECT_EQ("10,40",
       gfx::Screen::GetScreenFor(w1.get())->GetCursorScreenPoint().ToString());
 
   gfx::Transform transform3;
-  transform3.ConcatRotate(90.0f);
+  transform3.Rotate(90.0);
   w1->SetTransform(transform3);
   w1->MoveCursorTo(gfx::Point(5, 5));
   EXPECT_EQ("5,15",
       gfx::Screen::GetScreenFor(w1.get())->GetCursorScreenPoint().ToString());
 
   gfx::Transform transform4;
-  transform4.ConcatScale(2, 5);
-  transform4.ConcatRotate(90.0f);
-  transform4.ConcatTranslate(100, 100);
+  transform4.Translate(100.0, 100.0);
+  transform4.Rotate(90.0);
+  transform4.Scale(2.0, 5.0);
   w1->SetTransform(transform4);
   w1->MoveCursorTo(gfx::Point(10, 10));
   EXPECT_EQ("60,130",
       gfx::Screen::GetScreenFor(w1.get())->GetCursorScreenPoint().ToString());
 }
 
 // Test Window::ConvertPointToWindow() with complex transforms to both root and
 // non-root windows.
 TEST_F(WindowTest, MoveCursorToWithComplexTransform) {
   scoped_ptr<Window> w1(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500), NULL));
   scoped_ptr<Window> w11(
       CreateTestWindow(SK_ColorGREEN, 11, gfx::Rect(5, 5, 100, 100), w1.get()));
   scoped_ptr<Window> w111(
       CreateTestWindow(SK_ColorCYAN, 111, gfx::Rect(5, 5, 75, 75), w11.get()));
   scoped_ptr<Window> w1111(
       CreateTestWindow(SK_ColorRED, 1111, gfx::Rect(5, 5, 50, 50), w111.get()));
 
   RootWindow* root = root_window();
 
   // The root window expects transforms that produce integer rects.
   gfx::Transform root_transform;
-  root_transform.ConcatScale(2.0f, 3.0f);
-  root_transform.ConcatTranslate(-50, -50);
-  root_transform.ConcatRotate(-90.0f);
-  root_transform.ConcatTranslate(60, 70);
+  root_transform.Translate(60.0, 70.0);
+  root_transform.Rotate(-90.0);
+  root_transform.Translate(-50.0, -50.0);
+  root_transform.Scale(2.0, 3.0);
 
   gfx::Transform transform;
-  transform.ConcatScale(0.3f, 0.5f);
-  transform.ConcatRotate(10.0f);
-  transform.ConcatTranslate(10, 20);
+  transform.Translate(10.0, 20.0);
+  transform.Rotate(10.0);
+  transform.Scale(0.3, 0.5);
 
   root->SetTransform(root_transform);
   w1->SetTransform(transform);
   w11->SetTransform(transform);
   w111->SetTransform(transform);
   w1111->SetTransform(transform);
 
   w1111->MoveCursorTo(gfx::Point(10, 10));
 
 #if !defined(OS_WIN)
@@ skipping 894 matching lines @@
 
 // Tests transformation on the root window.
 TEST_F(WindowTest, Transform) {
   gfx::Size size = root_window()->GetHostSize();
   EXPECT_EQ(gfx::Rect(size),
             gfx::Screen::GetScreenFor(root_window())->GetDisplayNearestPoint(
                 gfx::Point()).bounds());
 
   // Rotate it clock-wise 90 degrees.
   gfx::Transform transform;
-  transform.SetRotate(90.0f);
-  transform.ConcatTranslate(size.height(), 0);
+  transform.Translate(size.height(), 0);
+  transform.Rotate(90.0);
   root_window()->SetTransform(transform);
 
   // The size should be the transformed size.
   gfx::Size transformed_size(size.height(), size.width());
   EXPECT_EQ(transformed_size.ToString(),
             root_window()->bounds().size().ToString());
   EXPECT_EQ(
       gfx::Rect(transformed_size).ToString(),
       gfx::Screen::GetScreenFor(root_window())->GetDisplayNearestPoint(
           gfx::Point()).bounds().ToString());
 
   // Host size shouldn't change.
   EXPECT_EQ(size.ToString(),
             root_window()->GetHostSize().ToString());
 }
 
 TEST_F(WindowTest, TransformGesture) {
   gfx::Size size = root_window()->GetHostSize();
 
   scoped_ptr<GestureTrackPositionDelegate> delegate(
       new GestureTrackPositionDelegate);
   scoped_ptr<Window> window(CreateTestWindowWithDelegate(delegate.get(), -1234,
       gfx::Rect(0, 0, 20, 20), NULL));
 
   // Rotate the root-window clock-wise 90 degrees.
   gfx::Transform transform;
-  transform.SetRotate(90.0f);
-  transform.ConcatTranslate(size.height(), 0);
+  transform.Translate(size.height(), 0.0);
+  transform.Rotate(90.0);
   root_window()->SetTransform(transform);
 
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED, gfx::Point(size.height() - 10, 10), 0, getTime());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
   EXPECT_EQ(gfx::Point(10, 10).ToString(), delegate->position().ToString());
 }
 
 // Various assertions for transient children.
 TEST_F(WindowTest, TransientChildren) {
@@ skipping 609 matching lines @@
   EXPECT_EQ("1 1 0", d1.GetMouseMotionCountsAndReset());
   EXPECT_EQ("0 0 0", d11.GetMouseMotionCountsAndReset());
 
   w11->Show();
   RunAllPendingInMessageLoop();
   EXPECT_EQ("0 0 1", d1.GetMouseMotionCountsAndReset());
   EXPECT_EQ("1 1 0", d11.GetMouseMotionCountsAndReset());
 
   // Transform: move d11 by 100 100.
   gfx::Transform transform;
-  transform.ConcatTranslate(100, 100);
+  transform.Translate(100, 100);
   w11->SetTransform(transform);
   RunAllPendingInMessageLoop();
   EXPECT_EQ("1 1 0", d1.GetMouseMotionCountsAndReset());
   EXPECT_EQ("0 0 1", d11.GetMouseMotionCountsAndReset());
 
   w11->SetTransform(gfx::Transform());
   RunAllPendingInMessageLoop();
   EXPECT_EQ("0 0 1", d1.GetMouseMotionCountsAndReset());
   EXPECT_EQ("1 1 0", d11.GetMouseMotionCountsAndReset());
 
@@ skipping 539 matching lines @@
   // Move |w2| to be a child of |w1|.
   w1->AddChild(w2.get());
   // Sine we moved in the same root, observer shouldn't be notified.
   EXPECT_EQ("0 0", observer.CountStringAndReset());
   // |w2| should still have focus after moving.
   EXPECT_TRUE(w2->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura