cc: Move filters from RenderPassDrawQuad to RenderPass

cc/surfaces/surface_aggregator_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 881 matching lines @@
 
   RenderPassId pass_id(1, 1);
   LocalFrameId grandchild_local_frame_id = allocator_.GenerateId();
   SurfaceId grandchild_surface_id(factory_.frame_sink_id(),
                                   grandchild_local_frame_id);
   factory_.Create(grandchild_local_frame_id);
   std::unique_ptr<RenderPass> grandchild_pass = RenderPass::Create();
   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);
 
   LocalFrameId child_one_local_frame_id = allocator_.GenerateId();
   SurfaceId child_one_surface_id(factory_.frame_sink_id(),
                                  child_one_local_frame_id);
   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 =
       child_one_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   grandchild_surface_quad->SetNew(child_one_pass->shared_quad_state_list.back(),
                                   gfx::Rect(SurfaceSize()),
                                   gfx::Rect(SurfaceSize()),
                                   grandchild_surface_id);
   AddSolidColorQuadWithBlendMode(
       SurfaceSize(), child_one_pass.get(), blend_modes[3]);
   QueuePassAsFrame(std::move(child_one_pass), child_one_local_frame_id);
 
   LocalFrameId child_two_local_frame_id = allocator_.GenerateId();
   SurfaceId child_two_surface_id(factory_.frame_sink_id(),
                                  child_two_local_frame_id);
   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]);
   SurfaceDrawQuad* child_one_surface_quad =
       root_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   child_one_surface_quad->SetNew(root_pass->shared_quad_state_list.back(),
                                  gfx::Rect(SurfaceSize()),
                                  gfx::Rect(SurfaceSize()),
                                  child_one_surface_id);
   AddSolidColorQuadWithBlendMode(
@@ skipping 653 matching lines @@
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
     // There were no changes since last aggregation, so output should be empty
     // and have no damage.
     ASSERT_EQ(1u, aggregated_pass_list.size());
     EXPECT_TRUE(aggregated_pass_list[0]->damage_rect.IsEmpty());
     ASSERT_EQ(0u, aggregated_pass_list[0]->quad_list.size());
   }
 
   // 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 non-root ones.

[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 not doing anything?

[ajuma, 2016/12/15 16:49:21]

Oh, I changed that while debugging and forgot to revert. Thanks for catching it!

+                                                                             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);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     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
   // means Surface
   // quad under it should be aggregated.
   {
     RenderPassId root_pass_ids[] = {RenderPassId(1, 1), RenderPassId(1, 2)};
     test::Quad root_quads1[] = {
         test::Quad::SolidColorQuad(1),
     };
     test::Quad root_quads2[] = {test::Quad::RenderPassQuad(root_pass_ids[0]),
                                 test::Quad::SurfaceQuad(child_surface_id, 1.f)};
     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])};
 
     RenderPassList root_pass_list;
     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);
   }
 
   {
     CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id);
 
     const RenderPassList& aggregated_pass_list =
         aggregated_frame.render_pass_list;
 
@@ skipping 321 matching lines @@
   // Output is insecure, so texture should be drawn.
   EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
 
   factory.Destroy(local_frame1_id);
   factory.Destroy(local_frame2_id);
 }
 
 }  // namespace
 }  // namespace cc