cc: Move filters from RenderPassDrawQuad to RenderPass

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index 7ca6399cf63477dec7af7271b5bebda804c8c5af..eab342a268968384be132e5c434476b3412fce57 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -130,7 +130,8 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
   render_pass->SetNew(render_pass_id, output_rect, output_rect,
-                      gfx::Transform());
+                      gfx::Transform(), cc::FilterOperations(),
+                      cc::FilterOperations());
 
   DrawWindowTree(render_pass.get(), root_window_, gfx::Vector2d(), 1.0f);
 
@@ -139,20 +140,19 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
   if (delegate_->IsInHighContrastMode()) {
     std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
     invert_pass->SetNew(cc::RenderPassId(2, 0), output_rect, output_rect,
-                        gfx::Transform());
+                        gfx::Transform(), cc::FilterOperations(),
+                        cc::FilterOperations());
     cc::SharedQuadState* shared_state =
         invert_pass->CreateAndAppendSharedQuadState();
     shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
                          output_rect, false, 1.f, SkBlendMode::kSrcOver, 0);
     auto* quad = invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
-    cc::FilterOperations filters;
-    filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
+    render_pass->filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
     quad->SetNew(shared_state, output_rect, output_rect, render_pass_id,
                  0 /* mask_resource_id */, gfx::Vector2dF() /* mask_uv_scale */,
-                 gfx::Size() /* mask_texture_size */, filters,
+                 gfx::Size() /* mask_texture_size */,
                  gfx::Vector2dF() /* filters_scale */,
-                 gfx::PointF() /* filters_origin */,
-                 cc::FilterOperations() /* background_filters */);
+                 gfx::PointF() /* filters_origin */);
     frame.render_pass_list.push_back(std::move(invert_pass));
   }