cc: Move filters from RenderPassDrawQuad to RenderPass

cc/test/surface_aggregator_test_helpers.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/test/surface_aggregator_test_helpers.h"
 
 #include <stddef.h>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 34 matching lines @@
                        quad_rect, surface_id);
 }
 void AddRenderPassQuad(RenderPass* pass, RenderPassId render_pass_id) {
   gfx::Rect output_rect = gfx::Rect(0, 0, 5, 5);
   SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState();
   shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
                        output_rect, false, 1, SkBlendMode::kSrcOver, 0);
   RenderPassDrawQuad* quad =
       pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(shared_state, output_rect, output_rect, render_pass_id, 0,
-               gfx::Vector2dF(), gfx::Size(), FilterOperations(),
-               gfx::Vector2dF(), gfx::PointF(), FilterOperations());
+               gfx::Vector2dF(), gfx::Size(), gfx::Vector2dF(), gfx::PointF());
 }
 
 void AddQuadInPass(RenderPass* pass, Quad desc) {
   switch (desc.material) {
     case DrawQuad::SOLID_COLOR:
       AddQuad(pass, gfx::Rect(0, 0, 5, 5), desc.color);
       break;
     case DrawQuad::SURFACE_CONTENT:
       AddSurfaceQuad(pass, gfx::Size(5, 5), desc.opacity, desc.surface_id);
       break;
     case DrawQuad::RENDER_PASS:
       AddRenderPassQuad(pass, desc.render_pass_id);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void AddPasses(RenderPassList* pass_list,
                const gfx::Rect& output_rect,
                Pass* passes,
                size_t pass_count) {
   gfx::Transform root_transform;
   for (size_t i = 0; i < pass_count; ++i) {
     Pass pass = passes[i];
-    RenderPass* test_pass =
-        AddRenderPass(pass_list, pass.id, output_rect, root_transform);
+    RenderPass* test_pass = AddRenderPass(pass_list, pass.id, output_rect,
+                                          root_transform, FilterOperations());
     for (size_t j = 0; j < pass.quad_count; ++j) {
       AddQuadInPass(test_pass, pass.quads[j]);
     }
   }
 }
 
 void TestQuadMatchesExpectations(Quad expected_quad, const DrawQuad* quad) {
   switch (expected_quad.material) {
     case DrawQuad::SOLID_COLOR: {
       ASSERT_EQ(DrawQuad::SOLID_COLOR, quad->material);
@@ skipping 35 matching lines @@
 
   for (size_t i = 0; i < passes->size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("Pass number %" PRIuS, i));
     RenderPass* pass = (*passes)[i].get();
     TestPassMatchesExpectations(expected_passes[i], pass);
   }
 }
 
 }  // namespace test
 }  // namespace cc