Move filters to RenderPassDrawQuad

cc/gl_renderer_pixeltest.cc

Index: cc/gl_renderer_pixeltest.cc
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc
index b444ee03ed7810c6d24f40b3f6f17a0cebafd51c..f5d63b23301e8dd0e79d78bc12958049c474348a 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/gl_renderer_pixeltest.cc
@@ -116,7 +116,10 @@ scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad(
                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(),

[danakj, 2012/12/19 21:22:52]

 // foreground filter

[piman, 2012/12/19 21:50:00]

Done.

+               skia::RefPtr<SkImageFilter>(),

[danakj, 2012/12/19 21:22:52]

 // foreground filter

[piman, 2012/12/19 21:50:00]

Done.

+               WebKit::WebFilterOperations());

[danakj, 2012/12/19 21:22:52]

 // background filter

[piman, 2012/12/19 21:50:00]

Done.

 
   return quad.PassAs<DrawQuad>();
 }
@@ -140,10 +143,8 @@ TEST_F(GLRendererPixelTest, simpleGreenRect) {
 
   RenderPassList pass_list;
   pass_list.push_back(pass.get());
-  RenderPassIdHashMap pass_map;
-  pass_map.add(id, pass.PassAs<RenderPass>());
 
-  renderer_->drawFrame(pass_list, pass_map);
+  renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")),
                                    rect));
@@ -184,13 +185,9 @@ TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
   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());
-
   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));