Move filters to RenderPassDrawQuad

cc/gl_renderer_pixeltest.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/gl_renderer.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "cc/compositor_frame_metadata.h"
 #include "cc/draw_quad.h"
@@ skipping 98 matching lines @@
 
 scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad(
     SharedQuadState* shared_state, gfx::Rect rect, RenderPass::Id pass_id) {
   scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
   quad->SetNew(shared_state,
                rect,
                pass_id,
                false,         // is_replica
                0,             // mask_resource_id
                rect,          // contents_changed_since_last_frame
-               gfx::RectF()); // mask_uv_rect
+               gfx::RectF(),  // mask_uv_rect
+               WebKit::WebFilterOperations(),   // foreground filters
+               skia::RefPtr<SkImageFilter>(),   // foreground filter
+               WebKit::WebFilterOperations());  // background filters
 
   return quad.PassAs<DrawQuad>();
 }
 
 
 #if !defined(OS_ANDROID)
 TEST_F(GLRendererPixelTest, simpleGreenRect) {
   gfx::Rect rect(0, 0, 200, 200);
 
   RenderPass::Id id(1, 1);
   scoped_ptr<RenderPass> pass = CreateTestRenderPass(id, rect);
 
   gfx::Transform content_to_target_transform;
   scoped_ptr<SharedQuadState> shared_state =
       CreateTestSharedQuadState(content_to_target_transform, rect);
 
   scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
   color_quad->SetNew(shared_state.get(), rect, SK_ColorGREEN);
 
   pass->quad_list.append(color_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
-  pass_list.push_back(pass.get());
-  RenderPassIdHashMap pass_map;
-  pass_map.add(id, pass.PassAs<RenderPass>());
+  pass_list.append(pass.Pass());
 
-  renderer_->drawFrame(pass_list, pass_map);
+  renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")),
                                    rect));
 }
 
 TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
   gfx::Rect viewport_rect(200, 200);
 
   RenderPass::Id root_pass_id(1, 1);
   scoped_ptr<RenderPass> root_pass =
@@ skipping 17 matching lines @@
   child_pass->quad_list.append(yellow.PassAs<DrawQuad>());
 
   scoped_ptr<SharedQuadState> pass_shared_state =
       CreateTestSharedQuadState(gfx::Transform(), pass_rect);
   root_pass->quad_list.append(
       CreateTestRenderPassDrawQuad(pass_shared_state.get(),
                                    pass_rect,
                                    child_pass_id));
 
   RenderPassList pass_list;
-  pass_list.push_back(child_pass.get());
-  pass_list.push_back(root_pass.get());
-
-  RenderPassIdHashMap pass_map;
-  pass_map.add(child_pass_id, child_pass.Pass());
-  pass_map.add(root_pass_id, root_pass.Pass());
+  pass_list.append(child_pass.Pass());
+  pass_list.append(root_pass.Pass());
 
   renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
   renderer_->decideRenderPassAllocationsForFrame(pass_list);
-  renderer_->drawFrame(pass_list, pass_map);
+  renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(
       FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect));
 }
 #endif
 
 }  // namespace
 }  // namespace cc