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

Unified Diff: ui/gfx/interpolated_transform_unittest.cc

Issue 7044062: Use SkMatrix44 for the underlying implementation of ui::Transform (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Gardening patch Created 9 years, 5 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 | « ui/gfx/compositor/layer_animator.cc ('k') | ui/gfx/point3.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/interpolated_transform_unittest.cc
diff --git a/ui/gfx/interpolated_transform_unittest.cc b/ui/gfx/interpolated_transform_unittest.cc
index 1aff853838d8f3a1765f88a5d48ebc7ba002f10f..08e72799f502e7e0235f2dd3139da77e8a9745f5 100644
--- a/ui/gfx/interpolated_transform_unittest.cc
+++ b/ui/gfx/interpolated_transform_unittest.cc
@@ -20,9 +20,13 @@ bool ApproximatelyEqual(float lhs, float rhs) {
}
bool ApproximatelyEqual(const ui::Transform& lhs, const ui::Transform& rhs) {
- for (int i = 0; i < 9; ++i) {
- if (!ApproximatelyEqual(lhs.matrix()[i], rhs.matrix()[i]))
- return false;
+ for (int i = 0; i < 4; ++i) {
+ for (int j = 0; j < 4; ++j) {
+ if (!ApproximatelyEqual(lhs.matrix().get(i, j),
+ rhs.matrix().get(i, j))) {
+ return false;
+ }
+ }
}
return true;
}
@@ -87,10 +91,10 @@ TEST(InterpolatedTransformTest, InterpolatedRotationAboutPivot) {
EXPECT_TRUE(ApproximatelyEqual(ui::Transform(), result));
result = interpolated_xform.Interpolate(1.0f);
gfx::Point expected_result = pivot;
- EXPECT_TRUE(result.TransformPoint(&pivot));
+ result.TransformPoint(pivot);
EXPECT_EQ(expected_result, pivot);
expected_result = gfx::Point(0, 100);
- EXPECT_TRUE(result.TransformPoint(&above_pivot));
+ result.TransformPoint(above_pivot);
EXPECT_EQ(expected_result, above_pivot);
}
@@ -104,9 +108,9 @@ TEST(InterpolatedTransformTest, InterpolatedScaleAboutPivot) {
EXPECT_TRUE(ApproximatelyEqual(ui::Transform(), result));
result = interpolated_xform.Interpolate(1.0f);
gfx::Point expected_result = pivot;
- EXPECT_TRUE(result.TransformPoint(&pivot));
+ result.TransformPoint(pivot);
EXPECT_EQ(expected_result, pivot);
expected_result = gfx::Point(100, 300);
- EXPECT_TRUE(result.TransformPoint(&above_pivot));
+ result.TransformPoint(above_pivot);
EXPECT_EQ(expected_result, above_pivot);
}
« no previous file with comments | « ui/gfx/compositor/layer_animator.cc ('k') | ui/gfx/point3.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698