cc/quads/draw_quad_unittest.cc - Issue 659683002: Include mask texture size in RenderPassDrawQuad

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 659683002: Include mask texture size in RenderPassDrawQuad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_mask_draw_quad_test

Patch Set: Created 6 years, 2 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/quads/draw_quad_unittest.cc

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

index e3697ec4bf36ae3e3be9d450598a1d6ebf839e06..308f08426ad5221a9e5c24e84687e18f1b70a7ac 100644

--- a/cc/quads/draw_quad_unittest.cc

+++ b/cc/quads/draw_quad_unittest.cc

@@ -328,7 +328,7 @@ void CompareDrawQuad(DrawQuad* quad,

} \

SETUP_AND_COPY_QUAD_ALL(Type, quad_all);

-#define CREATE_QUAD_ALL_RP(Type, a, b, c, d, e, f, copy_a) \

+#define CREATE_QUAD_ALL_RP(Type, a, b, c, d, e, f, g, copy_a) \

Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \

{ \

QUAD_DATA quad_all->SetAll(shared_state, \

@@ -341,15 +341,17 @@ void CompareDrawQuad(DrawQuad* quad,

c, \

d, \

e, \

- f); \

+ f, \

+ g); \

} \

SETUP_AND_COPY_QUAD_ALL_RP(Type, quad_all, copy_a);

-#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, copy_a) \

- Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \

- { \

- QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e, f, g); \

- } \

+#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, h, copy_a) \

+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \

+ { \

+ QUAD_DATA quad_new->SetNew( \

+ shared_state, quad_rect, a, b, c, d, e, f, g, h); \

+ } \

SETUP_AND_COPY_QUAD_NEW_RP(Type, quad_new, copy_a);

TEST(DrawQuadTest, CopyCheckerboardDrawQuad) {

@@ -417,7 +419,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {

gfx::Rect visible_rect(40, 50, 30, 20);

RenderPassId render_pass_id(22, 64);

ResourceProvider::ResourceId mask_resource_id = 78;

- gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);

+ gfx::Vector2dF mask_uv_scale(33.f, 19.f);

+ gfx::Size mask_texture_size(128, 134);

FilterOperations filters;

filters.Append(FilterOperation::CreateBlurFilter(1.f));

gfx::Vector2dF filters_scale;

@@ -432,7 +435,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {

visible_rect,

render_pass_id,

mask_resource_id,

- mask_u_v_rect,

+ mask_uv_scale,

+ mask_texture_size,

filters,

filters_scale,

background_filters,

@@ -441,7 +445,9 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {

EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect);

EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);

EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);

- EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());

+ EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());

danakj 2014/10/15 15:33:35 you don't need to ToString() anymore for these thi

enne (OOO) 2014/10/15 19:10:54 Punt. The rest of the file ToStrings everything,

+ EXPECT_EQ(mask_texture_size.ToString(),

+ copy_quad->mask_texture_size.ToString());

EXPECT_EQ(filters, copy_quad->filters);

EXPECT_EQ(filters_scale, copy_quad->filters_scale);

EXPECT_EQ(background_filters, copy_quad->background_filters);

@@ -449,7 +455,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {

CREATE_QUAD_ALL_RP(RenderPassDrawQuad,

render_pass_id,

mask_resource_id,

- mask_u_v_rect,

+ mask_uv_scale,

+ mask_texture_size,

filters,

filters_scale,

background_filters,

@@ -457,7 +464,9 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {

EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);

EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);

EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);

- EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());

+ EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());

+ EXPECT_EQ(mask_texture_size.ToString(),

+ copy_quad->mask_texture_size.ToString());

EXPECT_EQ(filters, copy_quad->filters);

EXPECT_EQ(filters_scale, copy_quad->filters_scale);

EXPECT_EQ(background_filters, copy_quad->background_filters);

@@ -756,7 +765,8 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {

gfx::Rect visible_rect(40, 50, 30, 20);

RenderPassId render_pass_id(22, 64);

ResourceProvider::ResourceId mask_resource_id = 78;

- gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);

+ gfx::Vector2dF mask_uv_scale(33.f, 19.f);

+ gfx::Size mask_texture_size(128, 134);

FilterOperations filters;

filters.Append(FilterOperation::CreateBlurFilter(1.f));

gfx::Vector2dF filters_scale(2.f, 3.f);

@@ -771,7 +781,8 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {

visible_rect,

render_pass_id,

mask_resource_id,

- mask_u_v_rect,

+ mask_uv_scale,

+ mask_texture_size,

filters,

filters_scale,

background_filters,

« cc/output/software_renderer.cc ('K') | « cc/output/software_renderer.cc ('k') | cc/quads/render_pass_draw_quad.h » ('j') | cc/quads/render_pass_draw_quad.cc » ('J')