cc/surfaces/surface_aggregator_unittest.cc - Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass

Unified Diff: cc/surfaces/surface_aggregator_unittest.cc

Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass (Closed)

Patch Set: Address review comments Created 4 years 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

Index: cc/surfaces/surface_aggregator_unittest.cc

diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc

index 9041c083222c8a42362a8e5888779e6571329039..b3897d839b2d1df857c34c6261c72957e64fef2b 100644

--- a/cc/surfaces/surface_aggregator_unittest.cc

+++ b/cc/surfaces/surface_aggregator_unittest.cc

@@ -899,8 +899,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {

gfx::Rect output_rect(SurfaceSize());

gfx::Rect damage_rect(SurfaceSize());

gfx::Transform transform_to_root_target;

- grandchild_pass->SetNew(

- pass_id, output_rect, damage_rect, transform_to_root_target);

+ grandchild_pass->SetNew(pass_id, output_rect, damage_rect,

+ transform_to_root_target);

AddSolidColorQuadWithBlendMode(

SurfaceSize(), grandchild_pass.get(), blend_modes[2]);

QueuePassAsFrame(std::move(grandchild_pass), grandchild_local_frame_id);

@@ -911,8 +911,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {

factory_.Create(child_one_local_frame_id);

std::unique_ptr<RenderPass> child_one_pass = RenderPass::Create();

- child_one_pass->SetNew(

- pass_id, output_rect, damage_rect, transform_to_root_target);

+ child_one_pass->SetNew(pass_id, output_rect, damage_rect,

+ transform_to_root_target);

AddSolidColorQuadWithBlendMode(

SurfaceSize(), child_one_pass.get(), blend_modes[1]);

SurfaceDrawQuad* grandchild_surface_quad =

@@ -931,15 +931,15 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {

factory_.Create(child_two_local_frame_id);

std::unique_ptr<RenderPass> child_two_pass = RenderPass::Create();

- child_two_pass->SetNew(

- pass_id, output_rect, damage_rect, transform_to_root_target);

+ child_two_pass->SetNew(pass_id, output_rect, damage_rect,

+ transform_to_root_target);

AddSolidColorQuadWithBlendMode(

SurfaceSize(), child_two_pass.get(), blend_modes[5]);

QueuePassAsFrame(std::move(child_two_pass), child_two_local_frame_id);

std::unique_ptr<RenderPass> root_pass = RenderPass::Create();

- root_pass->SetNew(

- pass_id, output_rect, damage_rect, transform_to_root_target);

+ root_pass->SetNew(pass_id, output_rect, damage_rect,

+ transform_to_root_target);

AddSolidColorQuadWithBlendMode(

SurfaceSize(), root_pass.get(), blend_modes[0]);

@@ -1613,26 +1613,27 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {

}

// Root surface has smaller damage rect, but filter on render pass means all

- // of it should be aggregated.

+ // of it and its descendant passes should be aggregated.

{

- RenderPassId root_pass_ids[] = {RenderPassId(1, 1), RenderPassId(1, 2)};

+ RenderPassId root_pass_ids[] = {RenderPassId(1, 1), RenderPassId(1, 2),

+ RenderPassId(1, 3)};

test::Quad root_quads1[] = {test::Quad::SurfaceQuad(child_surface_id, 1.f)};

test::Quad root_quads2[] = {test::Quad::RenderPassQuad(root_pass_ids[0])};

+ test::Quad root_quads3[] = {test::Quad::RenderPassQuad(root_pass_ids[1])};

test::Pass root_passes[] = {

test::Pass(root_quads1, arraysize(root_quads1), root_pass_ids[0]),

- test::Pass(root_quads2, arraysize(root_quads2), root_pass_ids[1])};

+ test::Pass(root_quads2, arraysize(root_quads2), root_pass_ids[1]),

+ test::Pass(root_quads3, arraysize(root_quads3), root_pass_ids[2])};

RenderPassList root_pass_list;

AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,

arraysize(root_passes));

- RenderPass* pass = root_pass_list[0].get();

- pass->shared_quad_state_list.front()->quad_to_target_transform.Translate(

- 10, 10);

- RenderPass* root_pass = root_pass_list[1].get();

- RenderPassDrawQuad* quad =

- static_cast<RenderPassDrawQuad*>(root_pass->quad_list.front());

- quad->filters.Append(FilterOperation::CreateBlurFilter(2));

+ RenderPass* pass = root_pass_list[1].get();

danakj 2016/12/14 23:23:57 can u name this |filter_pass| now cuz there's 2 no

ajuma 2016/12/15 16:49:21 Done.

+ pass->shared_quad_state_list.front()->quad_to_target_transform.Translate(0,

danakj 2016/12/14 23:23:57 Why the 0,0 change, and why is that different than

ajuma 2016/12/15 16:49:21 Oh, I changed that while debugging and forgot to r

+ 0);

+ RenderPass* root_pass = root_pass_list[2].get();

+ pass->filters.Append(FilterOperation::CreateBlurFilter(2));

root_pass->damage_rect = gfx::Rect(10, 10, 2, 2);

SubmitPassListAsFrame(&factory_, root_local_frame_id_, &root_pass_list);

}

@@ -1643,16 +1644,18 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {

const RenderPassList& aggregated_pass_list =

aggregated_frame.render_pass_list;

- ASSERT_EQ(3u, aggregated_pass_list.size());

+ ASSERT_EQ(4u, aggregated_pass_list.size());

EXPECT_EQ(gfx::Rect(SurfaceSize()), aggregated_pass_list[0]->damage_rect);

EXPECT_EQ(gfx::Rect(SurfaceSize()), aggregated_pass_list[1]->damage_rect);

- EXPECT_EQ(gfx::Rect(10, 10, 2, 2), aggregated_pass_list[2]->damage_rect);

+ EXPECT_EQ(gfx::Rect(SurfaceSize()), aggregated_pass_list[2]->damage_rect);

+ EXPECT_EQ(gfx::Rect(10, 10, 2, 2), aggregated_pass_list[3]->damage_rect);

EXPECT_EQ(1u, aggregated_pass_list[0]->quad_list.size());

EXPECT_EQ(1u, aggregated_pass_list[1]->quad_list.size());

+ EXPECT_EQ(1u, aggregated_pass_list[2]->quad_list.size());

// First render pass draw quad is outside damage rect, so shouldn't be

// drawn.

- EXPECT_EQ(0u, aggregated_pass_list[2]->quad_list.size());

+ EXPECT_EQ(0u, aggregated_pass_list[3]->quad_list.size());

}

// Root surface has smaller damage rect. Background filter on render pass

@@ -1673,12 +1676,11 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {

AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,

arraysize(root_passes));

+ RenderPass* pass = root_pass_list[0].get();

RenderPass* root_pass = root_pass_list[1].get();

root_pass->shared_quad_state_list.ElementAt(1)

->quad_to_target_transform.Translate(10, 10);

- RenderPassDrawQuad* quad =

- static_cast<RenderPassDrawQuad*>(root_pass->quad_list.front());

- quad->background_filters.Append(FilterOperation::CreateBlurFilter(2));

+ pass->background_filters.Append(FilterOperation::CreateBlurFilter(2));

root_pass->damage_rect = gfx::Rect(10, 10, 2, 2);

SubmitPassListAsFrame(&factory_, root_local_frame_id_, &root_pass_list);

}

« cc/surfaces/surface_aggregator.cc ('K') | « cc/surfaces/surface_aggregator.cc ('k') | cc/test/render_pass_test_utils.h » ('j') | no next file with comments »