cc/draw_quad_unittest.cc - Issue 11649005: cc: Support anti-aliasing for solid color layers.

Unified Diff: cc/draw_quad_unittest.cc

Issue 11649005: cc: Support anti-aliasing for solid color layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase and add DrawQuad::AntiAliasing struct. Created 7 years, 11 months 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

Index: cc/draw_quad_unittest.cc

diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc

index bb97502cbf56512b31947f7c1b04547febfa5dee..f2da30806f0b9ebf0c9fa102c3db99c17e090f2c 100644

--- a/cc/draw_quad_unittest.cc

+++ b/cc/draw_quad_unittest.cc

@@ -329,11 +329,11 @@ TEST(DrawQuadTest, copySolidColorDrawQuad)

SkColor color = 0x49494949;

CREATE_SHARED_STATE();

- CREATE_QUAD_1_NEW(SolidColorDrawQuad, color);

+ CREATE_QUAD_2_NEW(SolidColorDrawQuad, DrawQuad::AntiAliasing(), color);

EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);

EXPECT_EQ(color, copyQuad->color);

- CREATE_QUAD_1_ALL(SolidColorDrawQuad, color);

+ CREATE_QUAD_2_ALL(SolidColorDrawQuad, DrawQuad::AntiAliasing(), color);

EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);

EXPECT_EQ(color, copyQuad->color);

}

@@ -398,28 +398,28 @@ TEST(DrawQuadTest, copyTileDrawQuad)

bool bottomEdgeAA = true;

CREATE_SHARED_STATE();

- CREATE_QUAD_9_NEW(TileDrawQuad, opaqueRect, resourceId, texCoordRect, textureSize, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);

+ CREATE_QUAD_6_NEW(TileDrawQuad, opaqueRect, DrawQuad::AntiAliasing(leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA), resourceId, texCoordRect, textureSize, swizzleContents);

EXPECT_EQ(DrawQuad::TILED_CONTENT, copyQuad->material);

EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);

EXPECT_EQ(resourceId, copyQuad->resource_id);

EXPECT_EQ(texCoordRect, copyQuad->tex_coord_rect);

EXPECT_EQ(textureSize, copyQuad->texture_size);

EXPECT_EQ(swizzleContents, copyQuad->swizzle_contents);

- EXPECT_EQ(leftEdgeAA, copyQuad->left_edge_aa);

- EXPECT_EQ(topEdgeAA, copyQuad->top_edge_aa);

- EXPECT_EQ(rightEdgeAA, copyQuad->right_edge_aa);

- EXPECT_EQ(bottomEdgeAA, copyQuad->bottom_edge_aa);

+ EXPECT_EQ(leftEdgeAA, copyQuad->anti_aliasing.left_edge);

+ EXPECT_EQ(topEdgeAA, copyQuad->anti_aliasing.top_edge);

+ EXPECT_EQ(rightEdgeAA, copyQuad->anti_aliasing.right_edge);

+ EXPECT_EQ(bottomEdgeAA, copyQuad->anti_aliasing.bottom_edge);

- CREATE_QUAD_8_ALL(TileDrawQuad, resourceId, texCoordRect, textureSize, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);

+ CREATE_QUAD_5_ALL(TileDrawQuad, DrawQuad::AntiAliasing(leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA), resourceId, texCoordRect, textureSize, swizzleContents);