Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform

cc/math_util_unittest.cc

 // Copyright 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 "cc/math_util.h"
 
 #include <cmath>
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
-#include <public/WebTransformationMatrix.h>
+#include "ui/gfx/transform.h"
 
-using WebKit::WebTransformationMatrix;
+using gfx::Transform;
 
 namespace cc {
 namespace {
 
 TEST(MathUtilTest, verifyBackfaceVisibilityBasicCases)
 {
-    WebTransformationMatrix transform;
+    Transform transform;
 
-    transform.makeIdentity();
-    EXPECT_FALSE(transform.isBackFaceVisible());
+    transform.matrix().setIdentity();
+    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
 
-    transform.makeIdentity();
-    transform.rotate3d(0, 80, 0);
-    EXPECT_FALSE(transform.isBackFaceVisible());
+    transform.matrix().setIdentity();
+    MathUtil::rotateEulerAngles(&transform, 0, 80, 0);
+    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
 
-    transform.makeIdentity();
-    transform.rotate3d(0, 100, 0);
-    EXPECT_TRUE(transform.isBackFaceVisible());
+    transform.matrix().setIdentity();
+    MathUtil::rotateEulerAngles(&transform, 0, 100, 0);
+    EXPECT_TRUE(MathUtil::isBackFaceVisible(transform));
 
     // Edge case, 90 degree rotation should return false.
-    transform.makeIdentity();
-    transform.rotate3d(0, 90, 0);
-    EXPECT_FALSE(transform.isBackFaceVisible());
+    transform.matrix().setIdentity();
+    MathUtil::rotateEulerAngles(&transform, 0, 90, 0);
+    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
 }
 
 TEST(MathUtilTest, verifyBackfaceVisibilityForPerspective)
 {
-    WebTransformationMatrix layerSpaceToProjectionPlane;
+    Transform layerSpaceToProjectionPlane;
 
     // This tests if isBackFaceVisible works properly under perspective transforms.
     // Specifically, layers that may have their back face visible in orthographic
     // projection, may not actually have back face visible under perspective projection.
 
     // Case 1: Layer is rotated by slightly more than 90 degrees, at the center of the
     //         prespective projection. In this case, the layer's back-side is visible to
     //         the camera.
-    layerSpaceToProjectionPlane.makeIdentity();
-    layerSpaceToProjectionPlane.applyPerspective(1);
-    layerSpaceToProjectionPlane.translate3d(0, 0, 0);
-    layerSpaceToProjectionPlane.rotate3d(0, 100, 0);
-    EXPECT_TRUE(layerSpaceToProjectionPlane.isBackFaceVisible());
+    layerSpaceToProjectionPlane.matrix().setIdentity();
+    layerSpaceToProjectionPlane.PreconcatPerspectiveDepth(1);
+    layerSpaceToProjectionPlane.PreconcatTranslate3d(0, 0, 0);
+    MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 100, 0);
+    EXPECT_TRUE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
 
     // Case 2: Layer is rotated by slightly more than 90 degrees, but shifted off to the
     //         side of the camera. Because of the wide field-of-view, the layer's front
     //         side is still visible.
     //
     //                       |<-- front side of layer is visible to perspective camera
     //                    \  |            /
     //                     \ |           /
     //                      \|          /
     //                       |         /
     //                       |\       /<-- camera field of view
     //                       | \     /
     // back side of layer -->|  \   /
     //                           \./ <-- camera origin
     //
-    layerSpaceToProjectionPlane.makeIdentity();
-    layerSpaceToProjectionPlane.applyPerspective(1);
-    layerSpaceToProjectionPlane.translate3d(-10, 0, 0);
-    layerSpaceToProjectionPlane.rotate3d(0, 100, 0);
-    EXPECT_FALSE(layerSpaceToProjectionPlane.isBackFaceVisible());
+    layerSpaceToProjectionPlane.matrix().setIdentity();
+    layerSpaceToProjectionPlane.PreconcatPerspectiveDepth(1);
+    layerSpaceToProjectionPlane.PreconcatTranslate3d(-10, 0, 0);
+    MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 100, 0);
+    EXPECT_FALSE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
 
     // Case 3: Additionally rotating the layer by 180 degrees should of course show the
     //         opposite result of case 2.
-    layerSpaceToProjectionPlane.rotate3d(0, 180, 0);
-    EXPECT_TRUE(layerSpaceToProjectionPlane.isBackFaceVisible());
+    MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 180, 0);
+    EXPECT_TRUE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
 }
 
 TEST(MathUtilTest, verifyProjectionOfPerpendicularPlane)
 {
     // In this case, the m33() element of the transform becomes zero, which could cause a
     // divide-by-zero when projecting points/quads.
 
-    WebTransformationMatrix transform;
-    transform.makeIdentity();
-    transform.setM33(0);
+    Transform transform;
+    transform.matrix().setIdentity();
+    transform.matrix().setDouble(2, 2, 0);
 
     gfx::RectF rect = gfx::RectF(0, 0, 1, 1);
     gfx::RectF projectedRect = MathUtil::projectClippedRect(transform, rect);
 
     EXPECT_EQ(0, projectedRect.x());
     EXPECT_EQ(0, projectedRect.y());
     EXPECT_TRUE(projectedRect.IsEmpty());
 }
 
 TEST(MathUtilTest, verifyEnclosingClippedRectUsesCorrectInitialBounds)
@@ skipping 183 matching lines @@
     EXPECT_ROW4_EQ(33, 37, 41, 45, (*transform));
 }
 
 TEST(MathUtilGfxTransformTest, verifyDefaultConstructorCreatesIdentityMatrix)
 {
     gfx::Transform A;
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
-    EXPECT_TRUE(MathUtil::isIdentity(A));
+    EXPECT_TRUE(A.IsIdentity());
 }
 
 TEST(MathUtilGfxTransformTest, verifyCreateGfxTransformFor2dElements)
 {
     gfx::Transform A = MathUtil::createGfxTransform(1, 2, 3, 4, 5, 6);
     EXPECT_ROW1_EQ(1, 3, 0, 5, A);
     EXPECT_ROW2_EQ(2, 4, 0, 6, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
@@ skipping 18 matching lines @@
     EXPECT_ROW2_EQ(11, 15, 19, 23, B);
     EXPECT_ROW3_EQ(12, 16, 20, 24, B);
     EXPECT_ROW4_EQ(13, 17, 21, 25, B);
 }
 
 TEST(MathUtilGfxTransformTest, verifyMatrixInversion)
 {
     // Invert a translation
     gfx::Transform translation;
     translation.PreconcatTranslate3d(2, 3, 4);
-    EXPECT_TRUE(MathUtil::isInvertible(translation));
+    EXPECT_TRUE(translation.IsInvertible());
 
     gfx::Transform inverseTranslation = MathUtil::inverse(translation);
     EXPECT_ROW1_EQ(1, 0, 0, -2, inverseTranslation);
     EXPECT_ROW2_EQ(0, 1, 0, -3, inverseTranslation);
     EXPECT_ROW3_EQ(0, 0, 1, -4, inverseTranslation);
     EXPECT_ROW4_EQ(0, 0, 0,  1, inverseTranslation);
 
     // Note that inversion should not have changed the original matrix.
     EXPECT_ROW1_EQ(1, 0, 0, 2, translation);
     EXPECT_ROW2_EQ(0, 1, 0, 3, translation);
     EXPECT_ROW3_EQ(0, 0, 1, 4, translation);
     EXPECT_ROW4_EQ(0, 0, 0, 1, translation);
 
     // Invert a non-uniform scale
     gfx::Transform scale;
     scale.PreconcatScale3d(4, 10, 100);
-    EXPECT_TRUE(MathUtil::isInvertible(scale));
+    EXPECT_TRUE(scale.IsInvertible());
 
     gfx::Transform inverseScale = MathUtil::inverse(scale);
     EXPECT_ROW1_EQ(0.25,   0,    0, 0, inverseScale);
     EXPECT_ROW2_EQ(0,    .1f,    0, 0, inverseScale);
     EXPECT_ROW3_EQ(0,      0, .01f, 0, inverseScale);
     EXPECT_ROW4_EQ(0,      0,    0, 1, inverseScale);
 
     // Try to invert a matrix that is not invertible.
     // The inverse() function should simply return an identity matrix.
     gfx::Transform notInvertible;
     notInvertible.matrix().setDouble(0, 0, 0);
     notInvertible.matrix().setDouble(1, 1, 0);
     notInvertible.matrix().setDouble(2, 2, 0);
     notInvertible.matrix().setDouble(3, 3, 0);
-    EXPECT_FALSE(MathUtil::isInvertible(notInvertible));
+    EXPECT_FALSE(notInvertible.IsInvertible());
 
     gfx::Transform inverseOfNotInvertible;
     initializeTestMatrix(&inverseOfNotInvertible); // initialize this to something non-identity, to make sure that assignment below actually took place.
     inverseOfNotInvertible = MathUtil::inverse(notInvertible);
-    EXPECT_TRUE(MathUtil::isIdentity(inverseOfNotInvertible));
+    EXPECT_TRUE(inverseOfNotInvertible.IsIdentity());
 }
 
 TEST(MathUtilGfxTransformTest, verifyTo2DTransform)
 {
     gfx::Transform A;
     initializeTestMatrix(&A);
 
     gfx::Transform B = MathUtil::to2dTransform(A);
 
     EXPECT_ROW1_EQ(10, 14, 0, 22, B);
@@ skipping 141 matching lines @@
     EXPECT_ROW1_EQ(2036, 2292, 2548, 2804, A);
     EXPECT_ROW2_EQ(2162, 2434, 2706, 2978, A);
     EXPECT_ROW3_EQ(2288, 2576, 2864, 3152, A);
     EXPECT_ROW4_EQ(2414, 2718, 3022, 3326, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyMakeIdentiy)
 {
     gfx::Transform A;
     initializeTestMatrix(&A);
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
-    EXPECT_TRUE(MathUtil::isIdentity(A));
+    EXPECT_TRUE(A.IsIdentity());
 }
 
 TEST(MathUtilGfxTransformTest, verifyTranslate)
 {
     gfx::Transform A;
     A.PreconcatTranslate(2, 3);
     EXPECT_ROW1_EQ(1, 0, 0, 2, A);
     EXPECT_ROW2_EQ(0, 1, 0, 3, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that PreconcatTranslate() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale(5, 5);
     A.PreconcatTranslate(2, 3);
     EXPECT_ROW1_EQ(5, 0, 0, 10, A);
     EXPECT_ROW2_EQ(0, 5, 0, 15, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0,  A);
     EXPECT_ROW4_EQ(0, 0, 0, 1,  A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyTranslate3d)
 {
     gfx::Transform A;
     A.PreconcatTranslate3d(2, 3, 4);
     EXPECT_ROW1_EQ(1, 0, 0, 2, A);
     EXPECT_ROW2_EQ(0, 1, 0, 3, A);
     EXPECT_ROW3_EQ(0, 0, 1, 4, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that PreconcatTranslate3d() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     A.PreconcatTranslate3d(2, 3, 4);
     EXPECT_ROW1_EQ(6, 0, 0, 12, A);
     EXPECT_ROW2_EQ(0, 7, 0, 21, A);
     EXPECT_ROW3_EQ(0, 0, 8, 32, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1,  A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyScale)
 {
     gfx::Transform A;
     A.PreconcatScale(6, 7);
     EXPECT_ROW1_EQ(6, 0, 0, 0, A);
     EXPECT_ROW2_EQ(0, 7, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that PreconcatScale() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatTranslate3d(2, 3, 4);
     A.PreconcatScale(6, 7);
     EXPECT_ROW1_EQ(6, 0, 0, 2, A);
     EXPECT_ROW2_EQ(0, 7, 0, 3, A);
     EXPECT_ROW3_EQ(0, 0, 1, 4, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyScale3d)
 {
     gfx::Transform A;
     A.PreconcatScale3d(6, 7, 8);
     EXPECT_ROW1_EQ(6, 0, 0, 0, A);
     EXPECT_ROW2_EQ(0, 7, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that scale3d() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatTranslate3d(2, 3, 4);
     A.PreconcatScale3d(6, 7, 8);
     EXPECT_ROW1_EQ(6, 0, 0, 2, A);
     EXPECT_ROW2_EQ(0, 7, 0, 3, A);
     EXPECT_ROW3_EQ(0, 0, 8, 4, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotate)
 {
     gfx::Transform A;
     A.PreconcatRotate(90);
     EXPECT_ROW1_NEAR(0, -1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that PreconcatRotate() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     A.PreconcatRotate(90);
     EXPECT_ROW1_NEAR(0, -6, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(7, 0,  0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateEulerAngles)
 {
     gfx::Transform A;
 
     // Check rotation about z-axis
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateEulerAngles(&A, 0, 0, 90);
     EXPECT_ROW1_NEAR(0, -1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about x-axis
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateEulerAngles(&A, 90, 0, 0);
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_NEAR(0, 0, -1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_NEAR(0, 1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about y-axis.
     // Note carefully, the expected pattern is inverted compared to rotating about x axis or z axis.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateEulerAngles(&A, 0, 90, 0);
     EXPECT_ROW1_NEAR(0, 0, 1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_NEAR(-1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that rotate3d(rx, ry, rz) post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     MathUtil::rotateEulerAngles(&A, 0, 0, 90);
     EXPECT_ROW1_NEAR(0, -6, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(7, 0,  0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateEulerAnglesOrderOfCompositeRotations)
 {
     // Rotate3d(degreesX, degreesY, degreesZ) is actually composite transform consiting of
     // three primitive rotations. This test verifies that the ordering of those three
     // transforms is the intended ordering.
     //
     // The correct ordering for this test case should be:
     //   1. rotate by 30 degrees about z-axis
     //   2. rotate by 20 degrees about y-axis
     //   3. rotate by 10 degrees about x-axis
     //
     // Note: there are 6 possible orderings of 3 transforms. For the specific transforms
     // used in this test, all 6 combinations produce a unique matrix that is different
     // from the other orderings. That way, this test verifies the exact ordering.
 
     gfx::Transform A;
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateEulerAngles(&A, 10, 20, 30);
 
     EXPECT_ROW1_NEAR(0.8137976813493738026394908,
                      -0.4409696105298823720630708,
                      0.3785223063697923939763257,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(0.4698463103929541584413698,
                      0.8825641192593856043657752,
                      0.0180283112362972230968694,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_NEAR(-0.3420201433256686573969318,
                      0.1631759111665348205288950,
                      0.9254165783983233639631294,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForAlignedAxes)
 {
     gfx::Transform A;
 
     // Check rotation about z-axis
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateAxisAngle(&A, 0, 0, 1, 90);
     EXPECT_ROW1_NEAR(0, -1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about x-axis
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateAxisAngle(&A, 1, 0, 0, 90);
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_NEAR(0, 0, -1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_NEAR(0, 1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about y-axis.
     // Note carefully, the expected pattern is inverted compared to rotating about x axis or z axis.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateAxisAngle(&A, 0, 1, 0, 90);
     EXPECT_ROW1_NEAR(0, 0, 1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_NEAR(-1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that rotate3d(axis, angle) post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     MathUtil::rotateAxisAngle(&A, 0, 0, 1, 90);
     EXPECT_ROW1_NEAR(0, -6, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(7, 0,  0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForArbitraryAxis)
 {
@@ skipping 16 matching lines @@
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForDegenerateAxis)
 {
     // Check rotation about a degenerate zero vector.
     // It is expected to skip applying the rotation.
     gfx::Transform A;
 
     MathUtil::rotateAxisAngle(&A, 0, 0, 0, 45);
     // Verify that A remains unchanged.
-    EXPECT_TRUE(MathUtil::isIdentity(A));
+    EXPECT_TRUE(A.IsIdentity());
 
     initializeTestMatrix(&A);
     MathUtil::rotateAxisAngle(&A, 0, 0, 0, 35);
 
     // Verify that A remains unchanged.
     EXPECT_ROW1_EQ(10, 14, 18, 22, A);
     EXPECT_ROW2_EQ(11, 15, 19, 23, A);
     EXPECT_ROW3_EQ(12, 16, 20, 24, A);
     EXPECT_ROW4_EQ(13, 17, 21, 25, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifySkewX)
 {
     gfx::Transform A;
     A.PreconcatSkewX(45);
     EXPECT_ROW1_EQ(1, 1, 0, 0, A);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that skewX() post-multiplies the existing matrix.
     // Row 1, column 2, would incorrectly have value "7" if the matrix is pre-multiplied instead of post-multiplied.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     A.PreconcatSkewX(45);
     EXPECT_ROW1_EQ(6, 6, 0, 0, A);
     EXPECT_ROW2_EQ(0, 7, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifySkewY)
 {
     gfx::Transform A;
     A.PreconcatSkewY(45);
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_EQ(1, 1, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that skewY() post-multiplies the existing matrix.
     // Row 2, column 1, would incorrectly have value "6" if the matrix is pre-multiplied instead of post-multiplied.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
     A.PreconcatSkewY(45);
     EXPECT_ROW1_EQ(6, 0, 0, 0, A);
     EXPECT_ROW2_EQ(7, 7, 0, 0, A);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyPerspectiveDepth)
 {
     gfx::Transform A;
     A.PreconcatPerspectiveDepth(1);
     EXPECT_ROW1_EQ(1, 0,  0, 0, A);
     EXPECT_ROW2_EQ(0, 1,  0, 0, A);
     EXPECT_ROW3_EQ(0, 0,  1, 0, A);
     EXPECT_ROW4_EQ(0, 0, -1, 1, A);
 
     // Verify that PreconcatPerspectiveDepth() post-multiplies the existing matrix.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatTranslate3d(2, 3, 4);
     A.PreconcatPerspectiveDepth(1);
     EXPECT_ROW1_EQ(1, 0, -2, 2, A);
     EXPECT_ROW2_EQ(0, 1, -3, 3, A);
     EXPECT_ROW3_EQ(0, 0, -3, 4, A);
     EXPECT_ROW4_EQ(0, 0, -1, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyHasPerspective)
 {
     gfx::Transform A;
     A.PreconcatPerspectiveDepth(1);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatPerspectiveDepth(0);
     EXPECT_FALSE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 0, -1);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 1, -1);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 2, -0.3);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 3, 0.5);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 3, 0);
     EXPECT_TRUE(MathUtil::hasPerspective(A));
 }
 
 TEST(MathUtilGfxTransformTest, verifyIsInvertible)
 {
     gfx::Transform A;
 
     // Translations, rotations, scales, skews and arbitrary combinations of them are invertible.
-    MathUtil::makeIdentity(&A);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    A.matrix().setIdentity();
+    EXPECT_TRUE(A.IsInvertible());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatTranslate3d(2, 3, 4);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    EXPECT_TRUE(A.IsInvertible());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatScale3d(6, 7, 8);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    EXPECT_TRUE(A.IsInvertible());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     MathUtil::rotateEulerAngles(&A, 10, 20, 30);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    EXPECT_TRUE(A.IsInvertible());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatSkewX(45);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    EXPECT_TRUE(A.IsInvertible());
 
     // A perspective matrix (projection plane at z=0) is invertible. The intuitive
     // explanation is that perspective is eqivalent to a skew of the w-axis; skews are
     // invertible.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatPerspectiveDepth(1);
-    EXPECT_TRUE(MathUtil::isInvertible(A));
+    EXPECT_TRUE(A.IsInvertible());
 
     // A "pure" perspective matrix derived by similar triangles, with m44() set to zero
     // (i.e. camera positioned at the origin), is not invertible.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatPerspectiveDepth(1);
     A.matrix().setDouble(3, 3, 0);
-    EXPECT_FALSE(MathUtil::isInvertible(A));
+    EXPECT_FALSE(A.IsInvertible());
 
     // Adding more to a non-invertible matrix will not make it invertible in the general case.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.PreconcatPerspectiveDepth(1);
     A.matrix().setDouble(3, 3, 0);
     A.PreconcatScale3d(6, 7, 8);
     MathUtil::rotateEulerAngles(&A, 10, 20, 30);
     A.PreconcatTranslate3d(6, 7, 8);
-    EXPECT_FALSE(MathUtil::isInvertible(A));
+    EXPECT_FALSE(A.IsInvertible());
 
     // A degenerate matrix of all zeros is not invertible.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 0, 0);
     A.matrix().setDouble(1, 1, 0);
     A.matrix().setDouble(2, 2, 0);
     A.matrix().setDouble(3, 3, 0);
-    EXPECT_FALSE(MathUtil::isInvertible(A));
+    EXPECT_FALSE(A.IsInvertible());
 }
 
 TEST(MathUtilGfxTransformTest, verifyIsIdentity)
 {
     gfx::Transform A;
 
     initializeTestMatrix(&A);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
-    EXPECT_TRUE(MathUtil::isIdentity(A));
+    A.matrix().setIdentity();
+    EXPECT_TRUE(A.IsIdentity());
 
     // Modifying any one individual element should cause the matrix to no longer be identity.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 3, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 3, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 3, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 3, 2);
-    EXPECT_FALSE(MathUtil::isIdentity(A));
+    EXPECT_FALSE(A.IsIdentity());
 }
 
 TEST(MathUtilGfxTransformTest, verifyIsIdentityOrTranslation)
 {
     gfx::Transform A;
 
     initializeTestMatrix(&A);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
 
     // Modifying any non-translation components should cause isIdentityOrTranslation() to
     // return false. NOTE: (0, 3), (1, 3), and (2, 3) are the translation components, so
     // modifying them should still return true for isIdentityOrTranslation().
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 0, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 0, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 0, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 0, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 0, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 1, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 1, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 1, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 2, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 2, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 2, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 2, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 
     // Note carefully - expecting true here.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(0, 3, 2);
     EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
 
     // Note carefully - expecting true here.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(1, 3, 2);
     EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
 
     // Note carefully - expecting true here.
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(2, 3, 2);
     EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
 
-    MathUtil::makeIdentity(&A);
+    A.matrix().setIdentity();
     A.matrix().setDouble(3, 3, 2);
     EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
 }
 
 }  // namespace
 }  // namespace cc