Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3003)

Unified Diff: cc/float_quad_unittest.cc

Issue 11364044: cc: Replace WebCore::FloatQuad with gfx::QuadF. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reeebase. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/damage_tracker_unittest.cc ('k') | cc/gl_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/float_quad_unittest.cc
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
index d4a49763fea866b9261a3eba78d2f89180de44ed..ebcdc288cd00c4dc25f341847391e0e0bcb6f57b 100644
--- a/cc/float_quad_unittest.cc
+++ b/cc/float_quad_unittest.cc
@@ -4,10 +4,10 @@
#include "config.h"
-#include "FloatQuad.h"
#include "cc/math_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/rect_f.h"
+#include "ui/gfx/quad_f.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
@@ -15,6 +15,7 @@ using WebKit::WebTransformationMatrix;
namespace {
+// TODO(danakj) Move this test to ui/gfx/ when we don't use WebTransformationMatrix.
TEST(FloatQuadTest, IsRectilinearTest)
{
const int numRectilinear = 8;
@@ -31,9 +32,9 @@ TEST(FloatQuadTest, IsRectilinearTest)
for (int i = 0; i < numRectilinear; ++i) {
bool clipped = false;
- FloatQuad quad = MathUtil::mapQuad(rectilinearTrans[i], gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f), clipped);
+ gfx::QuadF quad = MathUtil::mapQuad(rectilinearTrans[i], gfx::QuadF(gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f)), clipped);
ASSERT_TRUE(!clipped);
- EXPECT_TRUE(quad.isRectilinear());
+ EXPECT_TRUE(quad.IsRectilinear());
}
const int numNonRectilinear = 10;
@@ -51,9 +52,9 @@ TEST(FloatQuadTest, IsRectilinearTest)
for (int i = 0; i < numNonRectilinear; ++i) {
bool clipped = false;
- FloatQuad quad = MathUtil::mapQuad(nonRectilinearTrans[i], gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f), clipped);
+ gfx::QuadF quad = MathUtil::mapQuad(nonRectilinearTrans[i], gfx::QuadF(gfx::RectF(0.01010101f, 0.01010101f, 100.01010101f, 100.01010101f)), clipped);
ASSERT_TRUE(!clipped);
- EXPECT_FALSE(quad.isRectilinear());
+ EXPECT_FALSE(quad.IsRectilinear());
}
}
« no previous file with comments | « cc/damage_tracker_unittest.cc ('k') | cc/gl_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698