| 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..a19beabd11e940623ebbddb1781b1951ebefc950 100644
|
| --- a/cc/surfaces/surface_aggregator_unittest.cc
|
| +++ b/cc/surfaces/surface_aggregator_unittest.cc
|
| @@ -899,8 +899,9 @@ 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, FilterOperations(),
|
| + FilterOperations());
|
| AddSolidColorQuadWithBlendMode(
|
| SurfaceSize(), grandchild_pass.get(), blend_modes[2]);
|
| QueuePassAsFrame(std::move(grandchild_pass), grandchild_local_frame_id);
|
| @@ -911,8 +912,9 @@ 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, FilterOperations(),
|
| + FilterOperations());
|
| AddSolidColorQuadWithBlendMode(
|
| SurfaceSize(), child_one_pass.get(), blend_modes[1]);
|
| SurfaceDrawQuad* grandchild_surface_quad =
|
| @@ -931,15 +933,16 @@ 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, FilterOperations(),
|
| + FilterOperations());
|
| 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,
|
| + FilterOperations(), FilterOperations());
|
|
|
| AddSolidColorQuadWithBlendMode(
|
| SurfaceSize(), root_pass.get(), blend_modes[0]);
|
| @@ -1630,9 +1633,7 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
|
| 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));
|
| + 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);
|
| }
|
| @@ -1673,12 +1674,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);
|
| }
|
|
|