| Index: cc/float_quad_unittest.cc
|
| diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
|
| index 93ebc6028c548d576a8b99f399182a7ef655ab0a..a13c582cb633a7862ae6c3d008808487918c10ef 100644
|
| --- a/cc/float_quad_unittest.cc
|
| +++ b/cc/float_quad_unittest.cc
|
| @@ -6,27 +6,25 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/rect_f.h"
|
| #include "ui/gfx/quad_f.h"
|
| -#include <public/WebTransformationMatrix.h>
|
| -
|
| -using WebKit::WebTransformationMatrix;
|
| +#include "ui/gfx/transform.h"
|
|
|
| namespace cc {
|
| namespace {
|
|
|
| -// TODO(danakj) Move this test to ui/gfx/ when we don't use WebTransformationMatrix.
|
| +// TODO(danakj) Move this test to ui/gfx/ when we don't need MathUtil::mapQuad.
|
| TEST(FloatQuadTest, IsRectilinearTest)
|
| {
|
| const int numRectilinear = 8;
|
| - WebTransformationMatrix rectilinearTrans[numRectilinear];
|
| - rectilinearTrans[1].rotate(90);
|
| - rectilinearTrans[2].rotate(180);
|
| - rectilinearTrans[3].rotate(270);
|
| - rectilinearTrans[4].skewX(0.00000000001);
|
| - rectilinearTrans[5].skewY(0.00000000001);
|
| - rectilinearTrans[6].scale(0.00001);
|
| - rectilinearTrans[6].rotate(180);
|
| - rectilinearTrans[7].scale(100000);
|
| - rectilinearTrans[7].rotate(180);
|
| + gfx::Transform rectilinearTrans[numRectilinear];
|
| + rectilinearTrans[1].Rotate(90);
|
| + rectilinearTrans[2].Rotate(180);
|
| + rectilinearTrans[3].Rotate(270);
|
| + rectilinearTrans[4].SkewX(0.00000000001);
|
| + rectilinearTrans[5].SkewY(0.00000000001);
|
| + rectilinearTrans[6].Scale(0.00001, 0.00001);
|
| + rectilinearTrans[6].Rotate(180);
|
| + rectilinearTrans[7].Scale(100000, 100000);
|
| + rectilinearTrans[7].Rotate(180);
|
|
|
| for (int i = 0; i < numRectilinear; ++i) {
|
| bool clipped = false;
|
| @@ -36,17 +34,17 @@ TEST(FloatQuadTest, IsRectilinearTest)
|
| }
|
|
|
| const int numNonRectilinear = 10;
|
| - WebTransformationMatrix nonRectilinearTrans[numNonRectilinear];
|
| - nonRectilinearTrans[0].rotate(359.999);
|
| - nonRectilinearTrans[1].rotate(0.0000001);
|
| - nonRectilinearTrans[2].rotate(89.999999);
|
| - nonRectilinearTrans[3].rotate(90.0000001);
|
| - nonRectilinearTrans[4].rotate(179.999999);
|
| - nonRectilinearTrans[5].rotate(180.0000001);
|
| - nonRectilinearTrans[6].rotate(269.999999);
|
| - nonRectilinearTrans[7].rotate(270.0000001);
|
| - nonRectilinearTrans[8].skewX(0.00001);
|
| - nonRectilinearTrans[9].skewY(0.00001);
|
| + gfx::Transform nonRectilinearTrans[numNonRectilinear];
|
| + nonRectilinearTrans[0].Rotate(359.999);
|
| + nonRectilinearTrans[1].Rotate(0.0000001);
|
| + nonRectilinearTrans[2].Rotate(89.999999);
|
| + nonRectilinearTrans[3].Rotate(90.0000001);
|
| + nonRectilinearTrans[4].Rotate(179.999999);
|
| + nonRectilinearTrans[5].Rotate(180.0000001);
|
| + nonRectilinearTrans[6].Rotate(269.999999);
|
| + nonRectilinearTrans[7].Rotate(270.0000001);
|
| + nonRectilinearTrans[8].SkewX(0.00001);
|
| + nonRectilinearTrans[9].SkewY(0.00001);
|
|
|
| for (int i = 0; i < numNonRectilinear; ++i) {
|
| bool clipped = false;
|
|
|