summaryrefslogtreecommitdiffstats
path: root/cc/quads/draw_quad_unittest.cc
diff options
context:
space:
mode:
authorhalliwell <halliwell@chromium.org>2015-05-13 14:58:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-13 21:59:00 +0000
commitaa11128275a38f5161a65de0cd5affb31856330d (patch)
tree66dd57a08b69e7aab97fb9431050aedf2c08550d /cc/quads/draw_quad_unittest.cc
parent7862c2537ff491d5865a451b3f9f96bb7c2f3483 (diff)
downloadchromium_src-aa11128275a38f5161a65de0cd5affb31856330d.zip
chromium_src-aa11128275a38f5161a65de0cd5affb31856330d.tar.gz
chromium_src-aa11128275a38f5161a65de0cd5affb31856330d.tar.bz2
Add detection for rotation and flip overlay transforms
Rotations and flips were listed in the enum, but not being allowed by OverlayCandidate::GetOverlayTransform. BUG= Review URL: https://codereview.chromium.org/1135813005 Cr-Commit-Position: refs/heads/master@{#329719}
Diffstat (limited to 'cc/quads/draw_quad_unittest.cc')
-rw-r--r--cc/quads/draw_quad_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 02d57ba..968a1d0 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -549,7 +549,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
gfx::PointF uv_top_left(0.5f, 224.f);
gfx::PointF uv_bottom_right(51.5f, 260.f);
const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
- bool flipped = true;
+ bool y_flipped = true;
bool nearest_neighbor = true;
CREATE_SHARED_STATE();
@@ -562,7 +562,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
uv_bottom_right,
SK_ColorTRANSPARENT,
vertex_opacity,
- flipped,
+ y_flipped,
nearest_neighbor);
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
@@ -572,7 +572,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
- EXPECT_EQ(flipped, copy_quad->flipped);
+ EXPECT_EQ(y_flipped, copy_quad->y_flipped);
EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
CREATE_QUAD_8_ALL(TextureDrawQuad,
@@ -582,7 +582,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
uv_bottom_right,
SK_ColorTRANSPARENT,
vertex_opacity,
- flipped,
+ y_flipped,
nearest_neighbor);
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
EXPECT_EQ(resource_id, copy_quad->resource_id);
@@ -590,7 +590,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
- EXPECT_EQ(flipped, copy_quad->flipped);
+ EXPECT_EQ(y_flipped, copy_quad->y_flipped);
EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
}
@@ -857,7 +857,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
gfx::PointF uv_top_left(0.5f, 224.f);
gfx::PointF uv_bottom_right(51.5f, 260.f);
const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
- bool flipped = true;
+ bool y_flipped = true;
bool nearest_neighbor = true;
CREATE_SHARED_STATE();
@@ -870,7 +870,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
uv_bottom_right,
SK_ColorTRANSPARENT,
vertex_opacity,
- flipped,
+ y_flipped,
nearest_neighbor);
EXPECT_EQ(resource_id, quad_new->resource_id);
EXPECT_EQ(1, IterateAndCount(quad_new));