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

Unified Diff: cc/damage_tracker_unittest.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years, 1 month 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: cc/damage_tracker_unittest.cc
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index 008dc93f986c7d4c921d633178203e1e9aae36c9..4427123f04426f76c5d23ee9d25e8a91fdd6535d 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -18,6 +18,8 @@
using namespace WebKit;
using namespace WebKitTests;
+using gfx::Transform;
+
namespace cc {
namespace {
@@ -285,8 +287,8 @@ TEST_F(DamageTrackerTest, verifyDamageForTransformedLayer)
scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface();
LayerImpl* child = root->children()[0];
- WebTransformationMatrix rotation;
- rotation.rotate(45);
+ Transform rotation;
+ rotation.PreconcatRotate(45);
clearDamageForAllSurfaces(root.get());
child->setAnchorPoint(gfx::PointF(0.5, 0.5));
@@ -328,11 +330,11 @@ TEST_F(DamageTrackerTest, verifyDamageForPerspectiveClippedLayer)
scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface();
LayerImpl* child = root->children()[0];
- WebTransformationMatrix transform;
- transform.translate3d(500, 500, 0);
- transform.applyPerspective(1);
- transform.rotate3d(0, 45, 0);
- transform.translate3d(-50, -50, 0);
+ Transform transform;
+ transform.PreconcatTranslate3d(500, 500, 0);
+ transform.PreconcatPerspectiveDepth(1);
+ MathUtil::rotateEulerAngles(&transform, 0, 45, 0);
+ transform.PreconcatTranslate3d(-50, -50, 0);
// Set up the child
child->setPosition(gfx::PointF(0, 0));
@@ -833,8 +835,8 @@ TEST_F(DamageTrackerTest, verifyDamageForReplica)
scoped_ptr<LayerImpl> grandChild1Replica = LayerImpl::create(7);
grandChild1Replica->setPosition(gfx::PointF());
grandChild1Replica->setAnchorPoint(gfx::PointF());
- WebTransformationMatrix reflection;
- reflection.scale3d(-1, 1, 1);
+ Transform reflection;
+ reflection.PreconcatScale3d(-1, 1, 1);
grandChild1Replica->setTransform(reflection);
grandChild1->setReplicaLayer(grandChild1Replica.Pass());
}
@@ -986,8 +988,8 @@ TEST_F(DamageTrackerTest, verifyDamageForReplicaMask)
scoped_ptr<LayerImpl> grandChild1Replica = LayerImpl::create(6);
grandChild1Replica->setPosition(gfx::PointF());
grandChild1Replica->setAnchorPoint(gfx::PointF());
- WebTransformationMatrix reflection;
- reflection.scale3d(-1, 1, 1);
+ Transform reflection;
+ reflection.PreconcatScale3d(-1, 1, 1);
grandChild1Replica->setTransform(reflection);
grandChild1->setReplicaLayer(grandChild1Replica.Pass());
}
@@ -1048,8 +1050,8 @@ TEST_F(DamageTrackerTest, verifyDamageForReplicaMaskWithAnchor)
scoped_ptr<LayerImpl> grandChild1Replica = LayerImpl::create(6);
grandChild1Replica->setPosition(gfx::PointF());
grandChild1Replica->setAnchorPoint(gfx::PointF(1, 0)); // This is the anchor being tested.
- WebTransformationMatrix reflection;
- reflection.scale3d(-1, 1, 1);
+ Transform reflection;
+ reflection.PreconcatScale3d(-1, 1, 1);
grandChild1Replica->setTransform(reflection);
grandChild1->setReplicaLayer(grandChild1Replica.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698