Migrate more functions from MathUtil to gfx::Transform

cc/draw_quad_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/draw_quad.h"
 
 #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"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
 #include "cc/yuv_video_draw_quad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 TEST(DrawQuadTest, copySharedQuadState)
 {
-    gfx::Transform quadTransform = MathUtil::createGfxTransform(1, 0.5, 0, 1, 0.5, 0);
+    gfx::Transform quadTransform = gfx::Transform(1, 0, 0.5, 1, 0.5, 0);

[danakj, 2013/01/11 04:14:12]

nit: these are going to have to become 1.0, 0.0, 0.5, 1.0, 0.5, 0.0 at some
point (ie. use .0 for double literals). might as well do that now?

     gfx::Rect visibleContentRect(10, 12, 14, 16);
     gfx::Rect clippedRectInTarget(19, 21, 23, 25);
     gfx::Rect clipRect = clippedRectInTarget;
     bool isClipped = true;
     float opacity = 0.25;
 
     scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
     state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, clipRect, isClipped, opacity);
 
     scoped_ptr<SharedQuadState> copy(state->Copy());
     EXPECT_EQ(quadTransform, copy->content_to_target_transform);
     EXPECT_RECT_EQ(visibleContentRect, copy->visible_content_rect);
     EXPECT_RECT_EQ(clippedRectInTarget, copy->clipped_rect_in_target);
     EXPECT_EQ(opacity, copy->opacity);
     EXPECT_RECT_EQ(clipRect, copy->clip_rect);
     EXPECT_EQ(isClipped, copy->is_clipped);
 }
 
 scoped_ptr<SharedQuadState> createSharedQuadState()
 {
-    gfx::Transform quadTransform = MathUtil::createGfxTransform(1, 0.5, 0, 1, 0.5, 0);
+    gfx::Transform quadTransform = gfx::Transform(1, 0, 0.5, 1, 0.5, 0);
     gfx::Rect visibleContentRect(10, 12, 14, 16);
     gfx::Rect clippedRectInTarget(19, 21, 23, 25);
     gfx::Rect clipRect = clippedRectInTarget;
     bool isClipped = false;
     float opacity = 1;
 
     scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
     state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, clipRect, isClipped, opacity);
     return state.Pass();
 }
@@ skipping 275 matching lines @@
 
     CREATE_QUAD_1_ALL(SolidColorDrawQuad, color);
     EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);
     EXPECT_EQ(color, copyQuad->color);
 }
 
 TEST(DrawQuadTest, copyStreamVideoDrawQuad)
 {
     gfx::Rect opaqueRect(3, 7, 10, 12);
     unsigned textureId = 64;
-    gfx::Transform matrix = MathUtil::createGfxTransform(0.5, 1, 0.25, 0.75, 0, 1);
+    gfx::Transform matrix = gfx::Transform(0.5, 0.25, 1, 0.75, 0, 1);
     CREATE_SHARED_STATE();
 
     CREATE_QUAD_3_NEW(StreamVideoDrawQuad, opaqueRect, textureId, matrix);
     EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copyQuad->material);
     EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);
     EXPECT_EQ(textureId, copyQuad->texture_id);
     EXPECT_EQ(matrix, copyQuad->matrix);
 
     CREATE_QUAD_2_ALL(StreamVideoDrawQuad, textureId, matrix);
     EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copyQuad->material);
@@ skipping 107 matching lines @@
     EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId);
     EXPECT_EQ(uPlane.size, copyQuad->u_plane.size);
     EXPECT_EQ(uPlane.format, copyQuad->u_plane.format);
     EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->v_plane.size);
     EXPECT_EQ(vPlane.format, copyQuad->v_plane.format);
 }
 
 }  // namespace
 }  // namespace cc