Use SkMatrix44 for the underlying implementation of ui::Transform

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 615 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HitTestView);
 };
 
 gfx::Point ConvertPointToView(View* view, const gfx::Point& p) {
   gfx::Point tmp(p);
   View::ConvertPointToView(view->GetWidget()->GetRootView(), view, &tmp);
   return tmp;
 }
 
+void RotateCounterclockwise(ui::Transform& transform) {
+  transform.matrix().set3x3(0, -1, 0,
+                            1,  0, 0,
+                            0,  0, 1);
+}
+
+void RotateClockwise(ui::Transform& transform) {
+  transform.matrix().set3x3( 0, 1, 0,
+                            -1, 0, 0,
+                             0, 0, 1);
+}
+
 }  // namespace
 
 TEST_F(ViewTest, HitTestMasks) {
   Widget* widget = new Widget;
   widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP));
   View* root_view = widget->GetRootView();
   root_view->SetBounds(0, 0, 500, 500);
 
   gfx::Rect v1_bounds = gfx::Rect(0, 0, 100, 100);
   HitTestView* v1 = new HitTestView(false);
@@ skipping 888 matching lines @@
   v1->AddChildView(v2);
 
   // At this moment, |v2| occupies (100, 100) to (300, 200) in |root|.
   v1->ClearScheduledPaintRect();
   v2->SchedulePaint();
 
   EXPECT_EQ(gfx::Rect(100, 100, 200, 100), v1->scheduled_paint_rect());
 
   // Rotate |v1| counter-clockwise.
   ui::Transform transform;
-  transform.SetRotate(-90.0f);
+  RotateCounterclockwise(transform);
   transform.SetTranslateY(500.0f);
   v1->SetTransform(transform);
 
   // |v2| now occupies (100, 200) to (200, 400) in |root|.
 
   v1->ClearScheduledPaintRect();
   v2->SchedulePaint();
 
   EXPECT_EQ(gfx::Rect(100, 200, 100, 200), v1->scheduled_paint_rect());
 
@@ skipping 13 matching lines @@
   widget->Init(params);
   View* root = widget->GetRootView();
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
 
   // At this moment, |v2| occupies (100, 100) to (300, 200) in |root|.
 
   // Rotate |v1| counter-clockwise.
   ui::Transform transform(v1->GetTransform());
-  transform.SetRotate(-90.0f);
+  RotateCounterclockwise(transform);
   transform.SetTranslateY(500.0f);
   v1->SetTransform(transform);
 
   // |v2| now occupies (100, 200) to (200, 400) in |root|.
   v1->Reset();
   v2->Reset();
 
   MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                      110, 210,
                      ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(190, v2->location_.x());
   EXPECT_EQ(10, v2->location_.y());
 
   MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
   root->OnMouseReleased(released);
 
   // Now rotate |v2| inside |v1| clockwise.
   transform = v2->GetTransform();
-  transform.SetRotate(90.0f);
+  RotateClockwise(transform);
   transform.SetTranslateX(100.0f);
   v2->SetTransform(transform);
 
   // Now, |v2| occupies (100, 100) to (200, 300) in |v1|, and (100, 300) to
   // (300, 400) in |root|.
 
   v1->Reset();
   v2->Reset();
 
   MouseEvent p2(ui::ET_MOUSE_PRESSED,
                 110, 320,
                 ui::EF_LEFT_BUTTON_DOWN);
   root->OnMousePressed(p2);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(10, v2->location_.x());
   EXPECT_EQ(20, v2->location_.y());
 
   root->OnMouseReleased(released);
 
   v1->SetTransform(ui::Transform());
   v2->SetTransform(ui::Transform());
 
   TestView* v3 = new TestView();
   v3->SetBounds(10, 10, 20, 30);
   v2->AddChildView(v3);
 
   // Rotate |v3| clockwise with respect to |v2|.
   transform = v1->GetTransform();
-  transform.SetRotate(90.0f);
+  RotateClockwise(transform);
   transform.SetTranslateX(30.0f);
   v3->SetTransform(transform);
 
   // Scale |v2| with respect to |v1| along both axis.
   transform = v2->GetTransform();
   transform.SetScale(0.8f, 0.5f);
   v2->SetTransform(transform);
 
   // |v3| occupies (108, 105) to (132, 115) in |root|.
 
@@ skipping 15 matching lines @@
   v1->SetTransform(ui::Transform());
   v2->SetTransform(ui::Transform());
   v3->SetTransform(ui::Transform());
 
   v1->Reset();
   v2->Reset();
   v3->Reset();
 
   // Rotate |v3| clockwise with respect to |v2|, and scale it along both axis.
   transform = v3->GetTransform();
-  transform.SetRotate(90.0f);
+  RotateClockwise(transform);
   transform.SetTranslateX(30.0f);
   // Rotation sets some scaling transformation. Using SetScale would overwrite
   // that and pollute the rotation. So combine the scaling with the existing
   // transforamtion.
   transform.ConcatScale(0.8f, 0.5f);
   v3->SetTransform(transform);
 
   // Translate |v2| with respect to |v1|.
   transform = v2->GetTransform();
   transform.SetTranslate(10, 10);
@@ skipping 32 matching lines @@
   viewport->SetBoundsRect(viewport_bounds);
   contents->SetBounds(0, 0, 100, 200);
 
   View* child = new View;
   contents->AddChildView(child);
   child->SetBounds(10, 90, 50, 50);
   EXPECT_EQ(gfx::Rect(0, 0, 50, 10), child->GetVisibleBounds());
 
   // Rotate |child| counter-clockwise
   ui::Transform transform;
-  transform.SetRotate(-90.0f);
+  RotateCounterclockwise(transform);
   transform.SetTranslateY(50.0f);
   child->SetTransform(transform);
   EXPECT_EQ(gfx::Rect(40, 0, 10, 50), child->GetVisibleBounds());
 
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OnVisibleBoundsChanged()
 
@@ skipping 110 matching lines @@
   transform.SetScale(5.0f, 7.0f);
   child_child->SetTransform(transform);
 
   // Sanity check to make sure basic transforms act as expected.
   {
     ui::Transform transform;
     transform.ConcatTranslate(1, 1);
     transform.ConcatScale(100, 55);
     transform.ConcatTranslate(110, -110);
 
-    EXPECT_EQ(210, transform.matrix().getTranslateX());
-    EXPECT_EQ(-55, transform.matrix().getTranslateY());
-    EXPECT_EQ(100, transform.matrix().getScaleX());
-    EXPECT_EQ(55, transform.matrix().getScaleY());
-    EXPECT_EQ(0, transform.matrix().getSkewX());
-    EXPECT_EQ(0, transform.matrix().getSkewY());
+    // convert to a 3x3 matrix.
+    SkMatrix matrix = transform.matrix();

[sky, 2011/06/24 20:58:19]

const SkMatrix& here and other places.

+
+    EXPECT_EQ(210, matrix.getTranslateX());
+    EXPECT_EQ(-55, matrix.getTranslateY());
+    EXPECT_EQ(100, matrix.getScaleX());
+    EXPECT_EQ(55, matrix.getScaleY());
+    EXPECT_EQ(0, matrix.getSkewX());
+    EXPECT_EQ(0, matrix.getSkewY());
   }
 
   {
     ui::Transform transform;
     transform.SetTranslate(1, 1);
     ui::Transform t2;
     t2.SetScale(100, 55);
     ui::Transform t3;
     t3.SetTranslate(110, -110);
     transform.ConcatTransform(t2);
     transform.ConcatTransform(t3);
 
-    EXPECT_EQ(210, transform.matrix().getTranslateX());
-    EXPECT_EQ(-55, transform.matrix().getTranslateY());
-    EXPECT_EQ(100, transform.matrix().getScaleX());
-    EXPECT_EQ(55, transform.matrix().getScaleY());
-    EXPECT_EQ(0, transform.matrix().getSkewX());
-    EXPECT_EQ(0, transform.matrix().getSkewY());
+    // convert to a 3x3 matrix
+    SkMatrix matrix = transform.matrix();
+
+    EXPECT_EQ(210, matrix.getTranslateX());
+    EXPECT_EQ(-55, matrix.getTranslateY());
+    EXPECT_EQ(100, matrix.getScaleX());
+    EXPECT_EQ(55, matrix.getScaleY());
+    EXPECT_EQ(0, matrix.getSkewX());
+    EXPECT_EQ(0, matrix.getSkewY());
   }
 
   // Conversions from child->top and top->child.
   {
     gfx::Point point(5, 5);
     View::ConvertPointToView(child, &top_view, &point);
     EXPECT_EQ(22, point.x());
     EXPECT_EQ(39, point.y());
 
     point.SetPoint(22, 39);
@@ skipping 594 matching lines @@
   v1->SetPosition(gfx::Point(25, 36));
   EXPECT_EQ(gfx::Rect(35, 47, 40, 50), v2->layer()->bounds());
 
   v2->SetPosition(gfx::Point(11, 12));
   EXPECT_EQ(gfx::Rect(36, 48, 40, 50), v2->layer()->bounds());
 }
 
 #endif  // VIEWS_COMPOSITOR || TOUCH_UI
 
 }  // namespace views