diff options
| author | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 08:29:00 +0000 |
|---|---|---|
| committer | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 08:29:00 +0000 |
| commit | c8686a05e1fa4cb3aa82690d7450791828096840 (patch) | |
| tree | c43ef1a56ac27a06bc1ed7c069850cf7c6790002 /cc/damage_tracker_unittest.cc | |
| parent | 5006a4185d3a95976ced07022188f9abb48790be (diff) | |
| download | chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.zip chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.gz chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.bz2 | |
Animation code is not yet migrated by this patch, due to WebTransformOperations.
BUG=159972
Review URL: https://codereview.chromium.org/11308153
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/damage_tracker_unittest.cc')
| -rw-r--r-- | cc/damage_tracker_unittest.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc index 008dc93..42eaaaf 100644 --- a/cc/damage_tracker_unittest.cc +++ b/cc/damage_tracker_unittest.cc @@ -285,8 +285,8 @@ TEST_F(DamageTrackerTest, verifyDamageForTransformedLayer) scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface(); LayerImpl* child = root->children()[0]; - WebTransformationMatrix rotation; - rotation.rotate(45); + gfx::Transform rotation; + rotation.Rotate(45); clearDamageForAllSurfaces(root.get()); child->setAnchorPoint(gfx::PointF(0.5, 0.5)); @@ -328,11 +328,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); + gfx::Transform transform; + transform.Translate3d(500, 500, 0); + transform.ApplyPerspectiveDepth(1); + MathUtil::rotateEulerAngles(&transform, 0, 45, 0); + transform.Translate3d(-50, -50, 0); // Set up the child child->setPosition(gfx::PointF(0, 0)); @@ -833,8 +833,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); + gfx::Transform reflection; + reflection.Scale3d(-1, 1, 1); grandChild1Replica->setTransform(reflection); grandChild1->setReplicaLayer(grandChild1Replica.Pass()); } @@ -986,8 +986,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); + gfx::Transform reflection; + reflection.Scale3d(-1, 1, 1); grandChild1Replica->setTransform(reflection); grandChild1->setReplicaLayer(grandChild1Replica.Pass()); } @@ -1048,8 +1048,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); + gfx::Transform reflection; + reflection.Scale3d(-1, 1, 1); grandChild1Replica->setTransform(reflection); grandChild1->setReplicaLayer(grandChild1Replica.Pass()); } |