cc: Move filters from RenderPassDrawQuad to RenderPass

cc/output/software_renderer_unittest.cc

 // Copyright 2012 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/output/software_renderer.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 83 matching lines @@
   gfx::Size outer_size(100, 100);
   gfx::Size inner_size(98, 98);
   gfx::Rect outer_rect(outer_size);
   gfx::Rect inner_rect(gfx::Point(1, 1), inner_size);
   gfx::Rect visible_rect(gfx::Point(1, 2), gfx::Size(98, 97));
 
   InitializeRenderer(base::WrapUnique(new SoftwareOutputDevice));
 
   RenderPassId root_render_pass_id = RenderPassId(1, 1);
   std::unique_ptr<RenderPass> root_render_pass = RenderPass::Create();
-  root_render_pass->SetNew(
-      root_render_pass_id, outer_rect, outer_rect, gfx::Transform());
+  root_render_pass->SetNew(root_render_pass_id, outer_rect, outer_rect,
+                           gfx::Transform(), FilterOperations(),
+                           FilterOperations());
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(), outer_size, outer_rect,
                             outer_rect, false, 1.0, SkBlendMode::kSrcOver, 0);
   SolidColorDrawQuad* inner_quad =
       root_render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   inner_quad->SetNew(
       shared_quad_state, inner_rect, inner_rect, SK_ColorCYAN, false);
   inner_quad->visible_rect = visible_rect;
   SolidColorDrawQuad* outer_quad =
@@ skipping 44 matching lines @@
   resource_provider()->CopyToResource(
       resource_yellow, static_cast<uint8_t*>(yellow_tile.getPixels()),
       outer_size);
   resource_provider()->CopyToResource(
       resource_cyan, static_cast<uint8_t*>(cyan_tile.getPixels()), inner_size);
 
   gfx::Rect root_rect = outer_rect;
 
   RenderPassId root_render_pass_id = RenderPassId(1, 1);
   std::unique_ptr<RenderPass> root_render_pass = RenderPass::Create();
-  root_render_pass->SetNew(
-      root_render_pass_id, root_rect, root_rect, gfx::Transform());
+  root_render_pass->SetNew(root_render_pass_id, root_rect, root_rect,
+                           gfx::Transform(), FilterOperations(),
+                           FilterOperations());
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(), outer_size, outer_rect,
                             outer_rect, false, 1.0, SkBlendMode::kSrcOver, 0);
   TileDrawQuad* inner_quad =
       root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
   inner_quad->SetNew(shared_quad_state, inner_rect, inner_rect, inner_rect,
                      resource_cyan, gfx::RectF(gfx::SizeF(inner_size)),
                      inner_size, false, false);
   TileDrawQuad* outer_quad =
@@ skipping 38 matching lines @@
           0, visible_rect.bottom() - 1, tile_rect.width(), tile_rect.bottom()),
       SK_ColorYELLOW);
 
   resource_provider()->CopyToResource(
       resource_cyan, static_cast<uint8_t*>(cyan_tile.getPixels()), tile_size);
 
   gfx::Rect root_rect(tile_size);
 
   RenderPassId root_render_pass_id = RenderPassId(1, 1);
   std::unique_ptr<RenderPass> root_render_pass = RenderPass::Create();
-  root_render_pass->SetNew(
-      root_render_pass_id, root_rect, root_rect, gfx::Transform());
+  root_render_pass->SetNew(root_render_pass_id, root_rect, root_rect,
+                           gfx::Transform(), FilterOperations(),
+                           FilterOperations());
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(), tile_size, tile_rect, tile_rect,
                             false, 1.0, SkBlendMode::kSrcOver, 0);
   TileDrawQuad* quad =
       root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
   quad->SetNew(shared_quad_state, tile_rect, tile_rect, tile_rect,
                resource_cyan, gfx::RectF(gfx::SizeF(tile_size)), tile_size,
                false, false);
   quad->visible_rect = visible_rect;
@@ skipping 31 matching lines @@
   float device_scale_factor = 1.f;
   gfx::Size viewport_size(100, 100);
 
   settings_.should_clear_root_render_pass = false;
   InitializeRenderer(base::WrapUnique(new SoftwareOutputDevice));
 
   RenderPassList list;
 
   // Draw a fullscreen green quad in a first frame.
   RenderPassId root_clear_pass_id(1, 0);
-  RenderPass* root_clear_pass = AddRenderPass(
-      &list, root_clear_pass_id, gfx::Rect(viewport_size), gfx::Transform());
+  RenderPass* root_clear_pass =
+      AddRenderPass(&list, root_clear_pass_id, gfx::Rect(viewport_size),
+                    gfx::Transform(), FilterOperations());
   AddQuad(root_clear_pass, gfx::Rect(viewport_size), SK_ColorGREEN);
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
 
   std::unique_ptr<SkBitmap> output =
       DrawAndCopyOutput(&list, device_scale_factor, viewport_size);
   EXPECT_EQ(viewport_size.width(), output->info().width());
   EXPECT_EQ(viewport_size.height(), output->info().height());
 
   EXPECT_EQ(SK_ColorGREEN, output->getColor(0, 0));
   EXPECT_EQ(SK_ColorGREEN, output->getColor(viewport_size.width() - 1,
                                             viewport_size.height() - 1));
 
   list.clear();
 
   // Draw a smaller magenta rect without filling the viewport in a separate
   // frame.
   gfx::Rect smaller_rect(20, 20, 60, 60);
 
   RenderPassId root_smaller_pass_id(2, 0);
-  RenderPass* root_smaller_pass = AddRenderPass(
-      &list, root_smaller_pass_id, gfx::Rect(viewport_size), gfx::Transform());
+  RenderPass* root_smaller_pass =
+      AddRenderPass(&list, root_smaller_pass_id, gfx::Rect(viewport_size),
+                    gfx::Transform(), FilterOperations());
   AddQuad(root_smaller_pass, smaller_rect, SK_ColorMAGENTA);
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
 
   output = DrawAndCopyOutput(&list, device_scale_factor, viewport_size);
   EXPECT_EQ(viewport_size.width(), output->info().width());
   EXPECT_EQ(viewport_size.height(), output->info().height());
 
   // If we didn't clear, the borders should still be green.
   EXPECT_EQ(SK_ColorGREEN, output->getColor(0, 0));
@@ skipping 11 matching lines @@
   float device_scale_factor = 1.f;
   gfx::Size viewport_size(100, 100);
   InitializeRenderer(base::WrapUnique(new SoftwareOutputDevice));
 
   RenderPassList list;
 
   // Pass drawn as inner quad is magenta.
   gfx::Rect smaller_rect(20, 20, 60, 60);
   RenderPassId smaller_pass_id(2, 1);
   RenderPass* smaller_pass =
-      AddRenderPass(&list, smaller_pass_id, smaller_rect, gfx::Transform());
+      AddRenderPass(&list, smaller_pass_id, smaller_rect, gfx::Transform(),
+                    FilterOperations());
   AddQuad(smaller_pass, smaller_rect, SK_ColorMAGENTA);
 
   // Root pass is green.
   RenderPassId root_clear_pass_id(1, 0);
-  RenderPass* root_clear_pass = AddRenderPass(
-      &list, root_clear_pass_id, gfx::Rect(viewport_size), gfx::Transform());
+  RenderPass* root_clear_pass =
+      AddRenderPass(&list, root_clear_pass_id, gfx::Rect(viewport_size),
+                    gfx::Transform(), FilterOperations());
   AddRenderPassQuad(root_clear_pass, smaller_pass);
   AddQuad(root_clear_pass, gfx::Rect(viewport_size), SK_ColorGREEN);
 
   // Interior pass quad has smaller visible rect.
   gfx::Rect interior_visible_rect(30, 30, 40, 40);
   root_clear_pass->quad_list.front()->visible_rect = interior_visible_rect;
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
 
   std::unique_ptr<SkBitmap> output =
@@ skipping 50 matching lines @@
 
   settings_.partial_swap_enabled = true;
 
   auto device_owned = base::MakeUnique<PartialSwapSoftwareOutputDevice>();
   auto* device = device_owned.get();
   InitializeRenderer(std::move(device_owned));
 
   RenderPassList list;
 
   RenderPassId root_pass_id(1, 0);
-  RenderPass* root_pass = AddRenderPass(
-      &list, root_pass_id, gfx::Rect(viewport_size), gfx::Transform());
+  RenderPass* root_pass =
+      AddRenderPass(&list, root_pass_id, gfx::Rect(viewport_size),
+                    gfx::Transform(), FilterOperations());
   AddQuad(root_pass, gfx::Rect(viewport_size), SK_ColorGREEN);
 
   // Partial frame, we should pass this rect to the SoftwareOutputDevice.
   // partial swap is enabled.
   root_pass->damage_rect = gfx::Rect(2, 2, 3, 3);
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
   renderer()->DrawFrame(&list, device_scale_factor, gfx::ColorSpace(),
                         viewport_size);
 
   // The damage rect should be reported to the SoftwareOutputDevice.
   EXPECT_EQ(gfx::Rect(2, 2, 3, 3), device->damage_rect_at_start());
   // The SkCanvas should be clipped to the damage rect.
   EXPECT_EQ(gfx::Rect(2, 2, 3, 3), device->clip_rect_at_end());
 }
 
 }  // namespace
 }  // namespace cc