Move filters to RenderPassDrawQuad

cc/render_pass_unittest.cc

Index: cc/render_pass_unittest.cc
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 2feaba8dba91e4238839b9538c5ad975f9785f8e..11b51b954048d97147984ee24be0d2f41097fa93 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "cc/render_pass.h"
 
-#include <public/WebFilterOperations.h>
-
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/math_util.h"
 #include "cc/test/geometry_test_utils.h"
@@ -14,8 +12,6 @@
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/transform.h"
 
-using WebKit::WebFilterOperation;
-using WebKit::WebFilterOperations;
 using cc::TestRenderPass;
 
 namespace cc {
@@ -31,9 +27,6 @@ struct RenderPassSize {
     gfx::RectF m_damageRect;
     bool m_hasTransparentBackground;
     bool m_hasOcclusionFromOutsideTargetSurface;
-    WebKit::WebFilterOperations m_filters;
-    WebKit::WebFilterOperations m_backgroundFilters;
-    SkImageFilter* m_filter;
 };
 
 TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
@@ -44,12 +37,6 @@ TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
     gfx::Rect damageRect(56, 123, 19, 43);
     bool hasTransparentBackground = true;
     bool hasOcclusionFromOutsideTargetSurface = true;
-    WebFilterOperations filters;
-    WebFilterOperations backgroundFilters;
-
-    filters.append(WebFilterOperation::createGrayscaleFilter(0.2f));
-    backgroundFilters.append(WebFilterOperation::createInvertFilter(0.2f));
-    skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
 
     scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
     pass->SetAll(id,
@@ -57,10 +44,7 @@ TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
                  damageRect,
                  transformToRoot,
                  hasTransparentBackground,
-                 hasOcclusionFromOutsideTargetSurface,
-                 filters,
-                 filter,
-                 backgroundFilters);
+                 hasOcclusionFromOutsideTargetSurface);
 
     // Stick a quad in the pass, this should not get copied.
     scoped_ptr<SharedQuadState> sharedState = SharedQuadState::Create();
@@ -80,9 +64,6 @@ TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
     EXPECT_RECT_EQ(pass->damage_rect, copy->damage_rect);
     EXPECT_EQ(pass->has_transparent_background, copy->has_transparent_background);
     EXPECT_EQ(pass->has_occlusion_from_outside_target_surface, copy->has_occlusion_from_outside_target_surface);
-    EXPECT_EQ(pass->filters, copy->filters);
-    EXPECT_EQ(pass->filter, copy->filter);
-    EXPECT_EQ(pass->background_filters, copy->background_filters);
     EXPECT_EQ(0u, copy->quad_list.size());
 
     EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));