Index: cc/draw_quad_unittest.cc |
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc |
index d1d8c99af11466f9f48433ab38d5947357434a2d..ad9138c43be65323ad8fe5903e7de23207eec447 100644 |
--- a/cc/draw_quad_unittest.cc |
+++ b/cc/draw_quad_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "cc/checkerboard_draw_quad.h" |
#include "cc/debug_border_draw_quad.h" |
#include "cc/io_surface_draw_quad.h" |
+#include "cc/math_util.h" |
#include "cc/render_pass_draw_quad.h" |
#include "cc/solid_color_draw_quad.h" |
#include "cc/stream_video_draw_quad.h" |
@@ -15,16 +16,16 @@ |
#include "cc/tile_draw_quad.h" |
#include "cc/yuv_video_draw_quad.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include <public/WebTransformationMatrix.h> |
+#include "ui/gfx/transform.h" |
-using WebKit::WebTransformationMatrix; |
+using gfx::Transform; |
namespace cc { |
namespace { |
TEST(DrawQuadTest, copySharedQuadState) |
{ |
- WebTransformationMatrix quadTransform(1, 0.5, 0, 1, 0.5, 0); |
+ Transform quadTransform = MathUtil::createGfxTransform(1, 0.5, 0, 1, 0.5, 0); |
gfx::Rect visibleContentRect(10, 12, 14, 16); |
gfx::Rect clippedRectInTarget(19, 21, 23, 25); |
float opacity = 0.25; |
@@ -41,7 +42,7 @@ TEST(DrawQuadTest, copySharedQuadState) |
scoped_ptr<SharedQuadState> createSharedQuadState() |
{ |
- WebTransformationMatrix quadTransform(1, 0.5, 0, 1, 0.5, 0); |
+ Transform quadTransform = MathUtil::createGfxTransform(1, 0.5, 0, 1, 0.5, 0); |
gfx::Rect visibleContentRect(10, 12, 14, 16); |
gfx::Rect clippedRectInTarget(19, 21, 23, 25); |
float opacity = 1; |
@@ -319,7 +320,7 @@ TEST(DrawQuadTest, copyStreamVideoDrawQuad) |
{ |
gfx::Rect opaqueRect(3, 7, 10, 12); |
unsigned textureId = 64; |
- WebTransformationMatrix matrix(0.5, 1, 0.25, 0.75, 0, 1); |
+ Transform matrix = MathUtil::createGfxTransform(0.5, 1, 0.25, 0.75, 0, 1); |
CREATE_SHARED_STATE(); |
CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaqueRect, textureId, matrix); |