| Index: cc/layer_tree_host_unittest.cc
|
| diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
|
| index 3ba3421aa1a3f88876a846bd29bdd62da6c473de..61c9e200af699dedd51d69d6c2ad7857bf1c9336 100644
|
| --- a/cc/layer_tree_host_unittest.cc
|
| +++ b/cc/layer_tree_host_unittest.cc
|
| @@ -1346,8 +1346,7 @@ public:
|
| EXPECT_RECT_EQ(gfx::Rect(0, 0, 60, 60), root->renderSurface()->contentRect());
|
|
|
| // The content bounds of the child should be scaled.
|
| - gfx::Size childBoundsScaled = child->bounds();
|
| - childBoundsScaled = gfx::ToRoundedSize(childBoundsScaled.Scale(1.5));
|
| + gfx::Size childBoundsScaled = gfx::ToCeiledSize(gfx::ScaleSize(child->bounds(), 1.5));
|
| EXPECT_EQ(childBoundsScaled, child->contentBounds());
|
|
|
| WebTransformationMatrix scaleTransform;
|
| @@ -2194,7 +2193,7 @@ public:
|
| virtual void beginTest() OVERRIDE
|
| {
|
| gfx::Size viewportSize(10, 10);
|
| - gfx::Size deviceViewportSize = gfx::ToCeiledSize(viewportSize.Scale(m_deviceScaleFactor));
|
| + gfx::Size deviceViewportSize = gfx::ToCeiledSize(gfx::ScaleSize(viewportSize, m_deviceScaleFactor));
|
| m_layerTreeHost->setViewportSize(viewportSize, deviceViewportSize);
|
|
|
| m_layerTreeHost->setDeviceScaleFactor(m_deviceScaleFactor);
|
| @@ -2354,7 +2353,7 @@ public:
|
| virtual void beginTest() OVERRIDE
|
| {
|
| gfx::Size viewportSize(10, 10);
|
| - gfx::Size deviceViewportSize = gfx::ToCeiledSize(viewportSize.Scale(m_deviceScaleFactor));
|
| + gfx::Size deviceViewportSize = gfx::ToCeiledSize(gfx::ScaleSize(viewportSize, m_deviceScaleFactor));
|
| m_layerTreeHost->setViewportSize(viewportSize, deviceViewportSize);
|
|
|
| m_layerTreeHost->setDeviceScaleFactor(m_deviceScaleFactor);
|
|
|