cc: Move filters from RenderPassDrawQuad to RenderPass

cc/surfaces/surfaces_pixeltest.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/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
@@ skipping 43 matching lines @@
   shared_state->SetAll(transform, layer_bounds, visible_layer_rect, clip_rect,
                        is_clipped, opacity, blend_mode, 0);
   return shared_state;
 }
 
 // Draws a very simple frame with no surface references.
 TEST_F(SurfacesPixelTest, DrawSimpleFrame) {
   gfx::Rect rect(device_viewport_size_);
   RenderPassId id(1, 1);
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
-  pass->SetNew(id, rect, rect, gfx::Transform());
+  pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+               FilterOperations());
 
   CreateAndAppendTestSharedQuadState(
       pass.get(), gfx::Transform(), device_viewport_size_);
 
   SolidColorDrawQuad* color_quad =
       pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   bool force_anti_aliasing_off = false;
   color_quad->SetNew(pass->shared_quad_state_list.back(),
                      rect,
                      rect,
@@ skipping 29 matching lines @@
   SurfaceId child_surface_id(factory_.frame_sink_id(), child_local_frame_id);
   LocalFrameId root_local_frame_id = allocator_.GenerateId();
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id);
 
   factory_.Create(child_local_frame_id);
   factory_.Create(root_local_frame_id);
   {
     gfx::Rect rect(device_viewport_size_);
     RenderPassId id(1, 1);
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
-    pass->SetNew(id, rect, rect, gfx::Transform());
+    pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+                 FilterOperations());
 
     CreateAndAppendTestSharedQuadState(
         pass.get(), gfx::Transform(), device_viewport_size_);
 
     SurfaceDrawQuad* surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
     surface_quad->SetNew(pass->shared_quad_state_list.back(),
                          gfx::Rect(child_size),
                          gfx::Rect(child_size),
                          child_surface_id);
@@ skipping 11 matching lines @@
     root_frame.render_pass_list.push_back(std::move(pass));
 
     factory_.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   {
     gfx::Rect rect(child_size);
     RenderPassId id(1, 1);
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
-    pass->SetNew(id, rect, rect, gfx::Transform());
+    pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+                 FilterOperations());
 
     CreateAndAppendTestSharedQuadState(
         pass.get(), gfx::Transform(), child_size);
 
     SolidColorDrawQuad* color_quad =
         pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
     bool force_anti_aliasing_off = false;
     color_quad->SetNew(pass->shared_quad_state_list.back(),
                        rect,
                        rect,
@@ skipping 38 matching lines @@
   LocalFrameId root_local_frame_id = allocator_.GenerateId();
   SurfaceId root_surface_id(factory_.frame_sink_id(), root_local_frame_id);
   factory_.Create(left_child_local_id);
   factory_.Create(right_child_local_id);
   factory_.Create(root_local_frame_id);
 
   {
     gfx::Rect rect(device_viewport_size_);
     RenderPassId id(1, 1);
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
-    pass->SetNew(id, rect, rect, gfx::Transform());
+    pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+                 FilterOperations());
 
     gfx::Transform surface_transform;
     CreateAndAppendTestSharedQuadState(
         pass.get(), surface_transform, device_viewport_size_);
 
     SurfaceDrawQuad* left_surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
     left_surface_quad->SetNew(pass->shared_quad_state_list.back(),
                               gfx::Rect(child_size),
                               gfx::Rect(child_size),
@@ skipping 14 matching lines @@
     root_frame.render_pass_list.push_back(std::move(pass));
 
     factory_.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   {
     gfx::Rect rect(child_size);
     RenderPassId id(1, 1);
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
-    pass->SetNew(id, rect, rect, gfx::Transform());
+    pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+                 FilterOperations());
 
     CreateAndAppendTestSharedQuadState(
         pass.get(), gfx::Transform(), child_size);
 
     SolidColorDrawQuad* top_color_quad =
         pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
     bool force_anti_aliasing_off = false;
     top_color_quad->SetNew(pass->shared_quad_state_list.back(),
                            gfx::Rect(quad_size),
                            gfx::Rect(quad_size),
@@ skipping 12 matching lines @@
     child_frame.render_pass_list.push_back(std::move(pass));
 
     factory_.SubmitCompositorFrame(left_child_local_id, std::move(child_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   {
     gfx::Rect rect(child_size);
     RenderPassId id(1, 1);
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
-    pass->SetNew(id, rect, rect, gfx::Transform());
+    pass->SetNew(id, rect, rect, gfx::Transform(), FilterOperations(),
+                 FilterOperations());
 
     CreateAndAppendTestSharedQuadState(
         pass.get(), gfx::Transform(), child_size);
 
     SolidColorDrawQuad* top_color_quad =
         pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
     bool force_anti_aliasing_off = false;
     top_color_quad->SetNew(pass->shared_quad_state_list.back(),
                            gfx::Rect(quad_size),
                            gfx::Rect(quad_size),
@@ skipping 28 matching lines @@
 
   factory_.Destroy(root_local_frame_id);
   factory_.Destroy(left_child_local_id);
   factory_.Destroy(right_child_local_id);
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)