| Index: cc/layer_tree_host_unittest.cc
|
| diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
|
| index f9c4f069c31f94a95a1c778345015c5e159c1bda..620d1bd856ad62ebbfa83b866b9f79187eee3ad7 100644
|
| --- a/cc/layer_tree_host_unittest.cc
|
| +++ b/cc/layer_tree_host_unittest.cc
|
| @@ -1809,46 +1809,6 @@ TEST_F(LayerTreeHostTestContinuousInvalidate, runMultiThread)
|
| runTest(true);
|
| }
|
|
|
| -class LayerTreeHostTestAdjustPointForZoom : public LayerTreeHostTest {
|
| -public:
|
| - LayerTreeHostTestAdjustPointForZoom()
|
| - {
|
| - }
|
| -
|
| - virtual void beginTest() OVERRIDE
|
| - {
|
| - gfx::Transform m;
|
| - m.Translate(250, 360);
|
| - m.Scale(2, 2);
|
| -
|
| - gfx::Point point(400, 550);
|
| - gfx::Point transformedPoint;
|
| -
|
| - // Unit transform, no change expected.
|
| - m_layerTreeHost->setImplTransform(gfx::Transform());
|
| - transformedPoint = gfx::ToRoundedPoint(m_layerTreeHost->adjustEventPointForPinchZoom(point));
|
| - EXPECT_EQ(point.x(), transformedPoint.x());
|
| - EXPECT_EQ(point.y(), transformedPoint.y());
|
| -
|
| - m_layerTreeHost->setImplTransform(m);
|
| -
|
| - // Apply m^(-1): 75 = (400 - 250) / 2; 95 = (550 - 360) / 2.
|
| - transformedPoint = gfx::ToRoundedPoint(m_layerTreeHost->adjustEventPointForPinchZoom(point));
|
| - EXPECT_EQ(75, transformedPoint.x());
|
| - EXPECT_EQ(95, transformedPoint.y());
|
| - endTest();
|
| - }
|
| -
|
| - virtual void afterTest() OVERRIDE
|
| - {
|
| - }
|
| -};
|
| -
|
| -TEST_F(LayerTreeHostTestAdjustPointForZoom, runMultiThread)
|
| -{
|
| - runTest(true);
|
| -}
|
| -
|
| class LayerTreeHostTestDeferCommits : public LayerTreeHostTest {
|
| public:
|
| LayerTreeHostTestDeferCommits()
|
|
|