Index: cc/tiled_layer_unittest.cc |
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc |
index 9e88f09d37982b38e3393b28bcc07fc88b41b014..46ecc07424218784dc08370bda9b057260548a62 100644 |
--- a/cc/tiled_layer_unittest.cc |
+++ b/cc/tiled_layer_unittest.cc |
@@ -18,10 +18,10 @@ |
#include "cc/test/tiled_layer_test_common.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gfx/rect_conversions.h" |
-#include <public/WebTransformationMatrix.h> |
+#include "ui/gfx/transform.h" |
using namespace WebKitTests; |
-using WebKit::WebTransformationMatrix; |
+using gfx::Transform; |
namespace cc { |
namespace { |
@@ -1141,8 +1141,8 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndTransforms) |
// This makes sure the painting works when the occluded region (in screen space) |
// is transformed differently than the layer. |
layer->setBounds(gfx::Size(600, 600)); |
- WebTransformationMatrix screenTransform; |
- screenTransform.scale(0.5); |
+ Transform screenTransform; |
+ screenTransform.PreconcatScale(0.5, 0.5); |
layer->setScreenSpaceTransform(screenTransform); |
layer->setDrawTransform(screenTransform); |
@@ -1173,8 +1173,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
layer->setContentsScale(0.5); |
EXPECT_FLOAT_EQ(layer->contentsScaleX(), layer->contentsScaleY()); |
layer->setBounds(gfx::Size(600, 600)); |
- WebTransformationMatrix drawTransform; |
- drawTransform.scale(1 / layer->contentsScaleX()); |
+ Transform drawTransform; |
+ double invScaleFactor = 1 / layer->contentsScaleX(); |
+ drawTransform.PreconcatScale(invScaleFactor, invScaleFactor); |
layer->setDrawTransform(drawTransform); |
layer->setScreenSpaceTransform(drawTransform); |
@@ -1215,8 +1216,8 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
layer->fakeLayerUpdater()->clearUpdateCount(); |
// This makes sure content scaling and transforms work together. |
- WebTransformationMatrix screenTransform; |
- screenTransform.scale(0.5); |
+ Transform screenTransform; |
+ screenTransform.PreconcatScale(0.5, 0.5); |
layer->setScreenSpaceTransform(screenTransform); |
layer->setDrawTransform(screenTransform); |