Index: cc/layer_tree_host_common_unittest.cc |
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc |
index 7888a6a4c107f0441bffdaff3cd249843176892f..a478e9cd2373088d75de3caee5b8b56d3e860a5d 100644 |
--- a/cc/layer_tree_host_common_unittest.cc |
+++ b/cc/layer_tree_host_common_unittest.cc |
@@ -209,7 +209,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForSingleLayer) |
// Case 6: The layer transform should occur with respect to the anchor point. |
gfx::Transform translationToAnchor; |
translationToAnchor.Translate(5, 0); |
- gfx::Transform expectedResult = translationToAnchor * layerTransform * MathUtil::inverse(translationToAnchor); |
+ gfx::Transform expectedResult = translationToAnchor * layerTransform * inverse(translationToAnchor); |
setLayerPropertiesForTesting(layer.get(), layerTransform, identityMatrix, gfx::PointF(0.5, 0), gfx::PointF(0, 0), gfx::Size(10, 12), false); |
executeCalculateDrawProperties(root.get()); |
EXPECT_TRANSFORMATION_MATRIX_EQ(expectedResult, layer->drawTransform()); |
@@ -218,7 +218,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForSingleLayer) |
// Case 7: Verify that position pre-multiplies the layer transform. |
// The current implementation of calculateDrawProperties does this implicitly, but it is |
// still worth testing to detect accidental regressions. |
- expectedResult = positionTransform * translationToAnchor * layerTransform * MathUtil::inverse(translationToAnchor); |
+ expectedResult = positionTransform * translationToAnchor * layerTransform * inverse(translationToAnchor); |
setLayerPropertiesForTesting(layer.get(), layerTransform, identityMatrix, gfx::PointF(0.5, 0), gfx::PointF(0, 1.2f), gfx::Size(10, 12), false); |
executeCalculateDrawProperties(root.get()); |
EXPECT_TRANSFORMATION_MATRIX_EQ(expectedResult, layer->drawTransform()); |
@@ -266,7 +266,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForSimpleHierarchy) |
parentLayerTransform.Scale3d(2, 2, 1); |
gfx::Transform parentTranslationToAnchor; |
parentTranslationToAnchor.Translate(2.5, 3); |
- gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * MathUtil::inverse(parentTranslationToAnchor); |
+ gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * inverse(parentTranslationToAnchor); |
setLayerPropertiesForTesting(parent.get(), parentLayerTransform, identityMatrix, gfx::PointF(0.25, 0.25), gfx::PointF(0, 0), gfx::Size(10, 12), false); |
setLayerPropertiesForTesting(child.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(16, 18), false); |
setLayerPropertiesForTesting(grandChild.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(76, 78), false); |
@@ -285,8 +285,8 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForSimpleHierarchy) |
gfx::Transform parentTranslationToCenter; |
parentTranslationToCenter.Translate(5, 6); |
// Sublayer matrix is applied to the center of the parent layer. |
- parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * MathUtil::inverse(parentTranslationToAnchor) |
- * parentTranslationToCenter * parentSublayerMatrix * MathUtil::inverse(parentTranslationToCenter); |
+ parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * inverse(parentTranslationToAnchor) |
+ * parentTranslationToCenter * parentSublayerMatrix * inverse(parentTranslationToCenter); |
gfx::Transform flattenedCompositeTransform = MathUtil::to2dTransform(parentCompositeTransform); |
setLayerPropertiesForTesting(parent.get(), parentLayerTransform, parentSublayerMatrix, gfx::PointF(0.25, 0.25), gfx::PointF(0, 0), gfx::Size(10, 12), false); |
setLayerPropertiesForTesting(child.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(16, 18), false); |
@@ -335,12 +335,12 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForSingleRenderSurface) |
parentSublayerMatrix.Scale3d(0.9, 1, 3.3); |
gfx::Transform parentTranslationToCenter; |
parentTranslationToCenter.Translate(50, 60); |
- gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * MathUtil::inverse(parentTranslationToAnchor) |
- * parentTranslationToCenter * parentSublayerMatrix * MathUtil::inverse(parentTranslationToCenter); |
+ gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * inverse(parentTranslationToAnchor) |
+ * parentTranslationToCenter * parentSublayerMatrix * inverse(parentTranslationToCenter); |
gfx::Vector2dF parentCompositeScale = MathUtil::computeTransform2dScaleComponents(parentCompositeTransform); |
gfx::Transform surfaceSublayerTransform; |
surfaceSublayerTransform.Scale(parentCompositeScale.x(), parentCompositeScale.y()); |
- gfx::Transform surfaceSublayerCompositeTransform = parentCompositeTransform * MathUtil::inverse(surfaceSublayerTransform); |
+ gfx::Transform surfaceSublayerCompositeTransform = parentCompositeTransform * inverse(surfaceSublayerTransform); |
// Child's render surface should not exist yet. |
ASSERT_FALSE(child->renderSurface()); |
@@ -394,8 +394,8 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForReplica) |
parentSublayerMatrix.Scale3d(10, 10, 3.3); |
gfx::Transform parentTranslationToCenter; |
parentTranslationToCenter.Translate(5, 6); |
- gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * MathUtil::inverse(parentTranslationToAnchor) |
- * parentTranslationToCenter * parentSublayerMatrix * MathUtil::inverse(parentTranslationToCenter); |
+ gfx::Transform parentCompositeTransform = parentTranslationToAnchor * parentLayerTransform * inverse(parentTranslationToAnchor) |
+ * parentTranslationToCenter * parentSublayerMatrix * inverse(parentTranslationToCenter); |
gfx::Transform childTranslationToCenter; |
childTranslationToCenter.Translate(8, 9); |
gfx::Transform replicaLayerTransform; |
@@ -403,7 +403,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForReplica) |
gfx::Vector2dF parentCompositeScale = MathUtil::computeTransform2dScaleComponents(parentCompositeTransform); |
gfx::Transform surfaceSublayerTransform; |
surfaceSublayerTransform.Scale(parentCompositeScale.x(), parentCompositeScale.y()); |
- gfx::Transform replicaCompositeTransform = parentCompositeTransform * replicaLayerTransform * MathUtil::inverse(surfaceSublayerTransform); |
+ gfx::Transform replicaCompositeTransform = parentCompositeTransform * replicaLayerTransform * inverse(surfaceSublayerTransform); |
// Child's render surface should not exist yet. |
ASSERT_FALSE(child->renderSurface()); |
@@ -481,9 +481,9 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForRenderSurfaceHierarchy) |
gfx::Transform replicaLayerTransform; |
replicaLayerTransform.Scale3d(-2, 5, 1); |
- gfx::Transform A = translationToAnchor * layerTransform * MathUtil::inverse(translationToAnchor); |
- gfx::Transform B = translationToCenter * sublayerTransform * MathUtil::inverse(translationToCenter); |
- gfx::Transform R = A * translationToAnchor * replicaLayerTransform * MathUtil::inverse(translationToAnchor); |
+ gfx::Transform A = translationToAnchor * layerTransform * inverse(translationToAnchor); |
+ gfx::Transform B = translationToCenter * sublayerTransform * inverse(translationToCenter); |
+ gfx::Transform R = A * translationToAnchor * replicaLayerTransform * inverse(translationToAnchor); |
gfx::Vector2dF surface1ParentTransformScale = MathUtil::computeTransform2dScaleComponents(A * B); |
gfx::Transform surface1SublayerTransform; |
@@ -492,7 +492,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForRenderSurfaceHierarchy) |
// SS1 = transform given to the subtree of renderSurface1 |
gfx::Transform SS1 = surface1SublayerTransform; |
// S1 = transform to move from renderSurface1 pixels to the layer space of the owning layer |
- gfx::Transform S1 = MathUtil::inverse(surface1SublayerTransform); |
+ gfx::Transform S1 = inverse(surface1SublayerTransform); |
gfx::Vector2dF surface2ParentTransformScale = MathUtil::computeTransform2dScaleComponents(SS1 * A * B); |
gfx::Transform surface2SublayerTransform; |
@@ -501,7 +501,7 @@ TEST(LayerTreeHostCommonTest, verifyTransformsForRenderSurfaceHierarchy) |
// SS2 = transform given to the subtree of renderSurface2 |
gfx::Transform SS2 = surface2SublayerTransform; |
// S2 = transform to move from renderSurface2 pixels to the layer space of the owning layer |
- gfx::Transform S2 = MathUtil::inverse(surface2SublayerTransform); |
+ gfx::Transform S2 = inverse(surface2SublayerTransform); |
setLayerPropertiesForTesting(parent.get(), layerTransform, sublayerTransform, gfx::PointF(0.25, 0), gfx::PointF(0, 0), gfx::Size(10, 10), false); |
setLayerPropertiesForTesting(renderSurface1.get(), layerTransform, sublayerTransform, gfx::PointF(0.25, 0), gfx::PointF(0, 0), gfx::Size(10, 10), false); |
@@ -1083,7 +1083,7 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithI |
// the correct space. This test will fail if the rotation/inverse are backwards, too, |
// so it requires perfect order of operations. |
expectedGreatGrandChildTransform.MakeIdentity(); |
- expectedGreatGrandChildTransform.PreconcatTransform(MathUtil::inverse(rotationAboutZ)); |
+ expectedGreatGrandChildTransform.PreconcatTransform(inverse(rotationAboutZ)); |
expectedGreatGrandChildTransform.Translate(10, 30); // explicit canceling out the scrollDelta that gets embedded in the fixed position layer's surface. |
expectedGreatGrandChildTransform.PreconcatTransform(rotationAboutZ); |
@@ -1191,7 +1191,7 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithM |
compoundDrawTransform.PreconcatTransform(rotationAboutZ); // rotation of greatGrandChild |
expectedFixedPositionChildTransform.MakeIdentity(); |
- expectedFixedPositionChildTransform.PreconcatTransform(MathUtil::inverse(compoundDrawTransform)); |
+ expectedFixedPositionChildTransform.PreconcatTransform(inverse(compoundDrawTransform)); |
expectedFixedPositionChildTransform.Translate(10, 30); // explicit canceling out the scrollDelta that gets embedded in the fixed position layer's surface. |
expectedFixedPositionChildTransform.PreconcatTransform(compoundDrawTransform); |
@@ -1325,7 +1325,7 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerThatH |
// affected by the scrollDelta, so its drawTransform needs to explicitly |
// inverse-compensate for the scroll that's embedded in the target surface. |
gfx::Transform expectedGrandChildTransform; |
- expectedGrandChildTransform.PreconcatTransform(MathUtil::inverse(rotationByZ)); |
+ expectedGrandChildTransform.PreconcatTransform(inverse(rotationByZ)); |
expectedGrandChildTransform.Translate(10, 20); // explicit canceling out the scrollDelta that gets embedded in the fixed position layer's surface. |
expectedGrandChildTransform.PreconcatTransform(rotationByZ); |
@@ -2064,7 +2064,7 @@ TEST(LayerTreeHostCommonTest, verifyVisibleRectForPerspectiveUnprojection) |
// testing the intended scenario. |
bool clipped = false; |
gfx::RectF clippedRect = MathUtil::mapClippedRect(layerToSurfaceTransform, layerContentRect); |
- MathUtil::projectQuad(MathUtil::inverse(layerToSurfaceTransform), gfx::QuadF(clippedRect), clipped); |
+ MathUtil::projectQuad(inverse(layerToSurfaceTransform), gfx::QuadF(clippedRect), clipped); |
ASSERT_TRUE(clipped); |
// Only the corner of the layer is not visible on the surface because of being |