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

Unified Diff: ui/gfx/compositor/layer_unittest.cc

Issue 8247009: Explicit animation support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated views desktop demo. Created 9 years, 2 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
Index: ui/gfx/compositor/layer_unittest.cc
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index 5521cf2830d6840e11dfe65a71d70259738ffe78..bb05c0ba6673bc426d08f8854fa6a790f90d2411 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -539,9 +539,9 @@ TEST_F(LayerWithNullDelegateTest, NoHoleWithTransform) {
EXPECT_TRUE(!parent->hole_rect().IsEmpty());
ui::Transform t;
- t.SetTranslate(-75, -75);
+ t.SetTranslate(-50, -50);
t.ConcatRotate(45.0f);
- t.ConcatTranslate(75, 75);
+ t.ConcatTranslate(50, 50);
child->SetTransform(t);
EXPECT_EQ(gfx::Rect(0, 0, 0, 0), parent->hole_rect());
@@ -558,13 +558,16 @@ TEST_F(LayerWithNullDelegateTest, HoleWithNinetyDegreeTransforms) {
for (int i = -4; i <= 4; ++i) {
ui::Transform t;
- t.SetTranslate(-75, -75);
+ // Need to rotate in local coordinates.
+ t.SetTranslate(-25, -25);
t.ConcatRotate(90.0f * i);
- t.ConcatTranslate(75, 75);
+ t.ConcatTranslate(25, 25);
child->SetTransform(t);
- gfx::Rect target_rect = child->bounds();
- child->transform().TransformRect(&target_rect);
+ gfx::Rect target_rect(child->bounds().size());
+ t.ConcatTranslate(child->bounds().x(), child->bounds().y());
+ t.TransformRect(&target_rect);
+
EXPECT_EQ(target_rect, parent->hole_rect());
}
}

Powered by Google App Engine
This is Rietveld 408576698