Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5112)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/animation/transform_operations_unittest.cc

Issue 2966793002: NOT FOR REVIEW - convert to cc animation
Patch Set: switch to transform operations Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/transform_operations.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/transform_operations_unittest.cc
diff --git a/cc/animation/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc
index 052b0f2ae8cb3773a4e5270a2ba402010f7800f7..b96f810e08764c39142cd949020b253e28f69d39 100644
--- a/cc/animation/transform_operations_unittest.cc
+++ b/cc/animation/transform_operations_unittest.cc
@@ -313,7 +313,7 @@ TEST(TransformOperationTest, BlendOrder) {
expected.PreconcatTransform(blended_translate);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
static void CheckProgress(SkMScalar progress,
@@ -324,7 +324,7 @@ static void CheckProgress(SkMScalar progress,
gfx::Transform expected_matrix = to_matrix;
expected_matrix.Blend(from_matrix, progress);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected_matrix, to_transform.Blend(from_transform, progress));
+ expected_matrix, to_transform.Blend(from_transform, progress).Apply());
}
TEST(TransformOperationTest, BlendProgress) {
@@ -393,7 +393,7 @@ TEST(TransformOperationTest, BlendWhenTypesDoNotMatch) {
expected.Blend(from, progress);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, LargeRotationsWithSameAxis) {
@@ -409,7 +409,7 @@ TEST(TransformOperationTest, LargeRotationsWithSameAxis) {
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 180);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, LargeRotationsWithSameAxisInDifferentDirection) {
@@ -424,7 +424,7 @@ TEST(TransformOperationTest, LargeRotationsWithSameAxisInDifferentDirection) {
gfx::Transform expected;
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, LargeRotationsWithDifferentAxes) {
@@ -445,7 +445,7 @@ TEST(TransformOperationTest, LargeRotationsWithDifferentAxes) {
expected.Blend(matrix_from, progress);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, RotationFromZeroDegDifferentAxes) {
@@ -459,7 +459,7 @@ TEST(TransformOperationTest, RotationFromZeroDegDifferentAxes) {
gfx::Transform expected;
expected.RotateAbout(gfx::Vector3dF(0, 1, 0), 225);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, RotationFromZeroDegSameAxes) {
@@ -473,7 +473,7 @@ TEST(TransformOperationTest, RotationFromZeroDegSameAxes) {
gfx::Transform expected;
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 225);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, RotationToZeroDegDifferentAxes) {
@@ -487,7 +487,7 @@ TEST(TransformOperationTest, RotationToZeroDegDifferentAxes) {
gfx::Transform expected;
expected.RotateAbout(gfx::Vector3dF(0, 1, 0), 225);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, RotationToZeroDegSameAxes) {
@@ -501,7 +501,7 @@ TEST(TransformOperationTest, RotationToZeroDegSameAxes) {
gfx::Transform expected;
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 225);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations_to.Blend(operations_from, progress));
+ expected, operations_to.Blend(operations_from, progress).Apply());
}
TEST(TransformOperationTest, BlendRotationFromIdentity) {
@@ -518,7 +518,7 @@ TEST(TransformOperationTest, BlendRotationFromIdentity) {
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 45);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = -0.5f;
@@ -526,7 +526,7 @@ TEST(TransformOperationTest, BlendRotationFromIdentity) {
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), -45);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = 1.5f;
@@ -534,7 +534,7 @@ TEST(TransformOperationTest, BlendRotationFromIdentity) {
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 135);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
}
}
@@ -552,7 +552,7 @@ TEST(TransformOperationTest, BlendTranslationFromIdentity) {
expected.Translate3d(1, 1, 1);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = -0.5f;
@@ -560,7 +560,7 @@ TEST(TransformOperationTest, BlendTranslationFromIdentity) {
expected.Translate3d(-1, -1, -1);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = 1.5f;
@@ -568,7 +568,7 @@ TEST(TransformOperationTest, BlendTranslationFromIdentity) {
expected.Translate3d(3, 3, 3);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
}
}
@@ -586,7 +586,7 @@ TEST(TransformOperationTest, BlendScaleFromIdentity) {
expected.Scale3d(2, 2, 2);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = -0.5f;
@@ -594,7 +594,7 @@ TEST(TransformOperationTest, BlendScaleFromIdentity) {
expected.Scale3d(0, 0, 0);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
progress = 1.5f;
@@ -602,7 +602,7 @@ TEST(TransformOperationTest, BlendScaleFromIdentity) {
expected.Scale3d(4, 4, 4);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
}
}
@@ -617,24 +617,24 @@ TEST(TransformOperationTest, BlendSkewFromEmpty) {
gfx::Transform expected;
expected.Skew(1, 1);
- EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
- operations.Blend(empty_operation, progress));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(
+ expected, operations.Blend(empty_operation, progress).Apply());
progress = -0.5f;
expected.MakeIdentity();
expected.Skew(-1, -1);
- EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
- operations.Blend(empty_operation, progress));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(
+ expected, operations.Blend(empty_operation, progress).Apply());
progress = 1.5f;
expected.MakeIdentity();
expected.Skew(3, 3);
- EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
- operations.Blend(empty_operation, progress));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(
+ expected, operations.Blend(empty_operation, progress).Apply());
}
TEST(TransformOperationTest, BlendPerspectiveFromIdentity) {
@@ -651,7 +651,7 @@ TEST(TransformOperationTest, BlendPerspectiveFromIdentity) {
expected.ApplyPerspectiveDepth(2000);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations.Blend(*identity_operations[i], progress));
+ expected, operations.Blend(*identity_operations[i], progress).Apply());
}
}
@@ -669,7 +669,7 @@ TEST(TransformOperationTest, BlendRotationToIdentity) {
expected.RotateAbout(gfx::Vector3dF(0, 0, 1), 45);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, identity_operations[i]->Blend(operations, progress));
+ expected, identity_operations[i]->Blend(operations, progress).Apply());
}
}
@@ -687,7 +687,7 @@ TEST(TransformOperationTest, BlendTranslationToIdentity) {
expected.Translate3d(1, 1, 1);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, identity_operations[i]->Blend(operations, progress));
+ expected, identity_operations[i]->Blend(operations, progress).Apply());
}
}
@@ -705,7 +705,7 @@ TEST(TransformOperationTest, BlendScaleToIdentity) {
expected.Scale3d(2, 2, 2);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, identity_operations[i]->Blend(operations, progress));
+ expected, identity_operations[i]->Blend(operations, progress).Apply());
}
}
@@ -720,8 +720,8 @@ TEST(TransformOperationTest, BlendSkewToEmpty) {
gfx::Transform expected;
expected.Skew(1, 1);
- EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
- empty_operation.Blend(operations, progress));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(
+ expected, empty_operation.Blend(operations, progress).Apply());
}
TEST(TransformOperationTest, BlendPerspectiveToIdentity) {
@@ -738,7 +738,7 @@ TEST(TransformOperationTest, BlendPerspectiveToIdentity) {
expected.ApplyPerspectiveDepth(2000);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, identity_operations[i]->Blend(operations, progress));
+ expected, identity_operations[i]->Blend(operations, progress).Apply());
}
}
@@ -752,14 +752,14 @@ TEST(TransformOperationTest, ExtrapolatePerspectiveBlending) {
gfx::Transform expected;
expected.ApplyPerspectiveDepth(400);
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations1.Blend(operations2, -0.5));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
+ operations1.Blend(operations2, -0.5).Apply());
expected.MakeIdentity();
expected.ApplyPerspectiveDepth(2000);
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations1.Blend(operations2, 1.5));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
+ operations1.Blend(operations2, 1.5).Apply());
}
TEST(TransformOperationTest, ExtrapolateMatrixBlending) {
@@ -774,12 +774,12 @@ TEST(TransformOperationTest, ExtrapolateMatrixBlending) {
operations2.AppendMatrix(transform2);
gfx::Transform expected;
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations1.Blend(operations2, 1.5));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
+ operations1.Blend(operations2, 1.5).Apply());
expected.Translate3d(4, 4, 4);
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- expected, operations1.Blend(operations2, -0.5));
+ EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
+ operations1.Blend(operations2, -0.5).Apply());
}
TEST(TransformOperationTest, BlendedBoundsWhenTypesDoNotMatch) {
@@ -1067,7 +1067,7 @@ static void EmpiricallyTestBounds(const TransformOperations& from,
for (size_t step = 0; step < kNumSteps; ++step) {
float t = step / (kNumSteps - 1.f);
t = gfx::Tween::FloatValueBetween(t, min_progress, max_progress);
- gfx::Transform partial_transform = to.Blend(from, t);
+ gfx::Transform partial_transform = to.Blend(from, t).Apply();
gfx::BoxF transformed = box;
partial_transform.TransformBox(&transformed);
@@ -1202,7 +1202,7 @@ TEST(TransformOperationTest, PerspectiveMatrixAndTransformBlendingEquivalency) {
EXPECT_TRUE(blended_matrix.Blend(from_transform, progress));
gfx::Transform blended_transform =
- to_operations.Blend(from_operations, progress);
+ to_operations.Blend(from_operations, progress).Apply();
EXPECT_TRANSFORMATION_MATRIX_EQ(blended_matrix, blended_transform);
}
@@ -1286,7 +1286,7 @@ TEST(TransformOperationTest, NonCommutativeRotations) {
EXPECT_TRUE(operations_to.BlendedBoundsForBox(
box, operations_from, min_progress, max_progress, &bounds));
gfx::Transform blended_transform =
- operations_to.Blend(operations_from, max_progress);
+ operations_to.Blend(operations_from, max_progress).Apply();
gfx::Point3F blended_point(0.9f, 0.9f, 0.0f);
blended_transform.TransformPoint(&blended_point);
gfx::BoxF expanded_bounds = bounds;
« no previous file with comments | « cc/animation/transform_operations.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698