Move filters to RenderPassDrawQuad

cc/render_pass_draw_quad.cc

Index: cc/render_pass_draw_quad.cc
diff --git a/cc/render_pass_draw_quad.cc b/cc/render_pass_draw_quad.cc
index f0ae447b5ceed2dab0001570b2845b49a47b8a24..b46d3b754889345b21e73f828aa5941698c9f18e 100644
--- a/cc/render_pass_draw_quad.cc
+++ b/cc/render_pass_draw_quad.cc
@@ -12,6 +12,9 @@ RenderPassDrawQuad::RenderPassDrawQuad()
       mask_resource_id(-1) {
 }
 
+RenderPassDrawQuad::~RenderPassDrawQuad() {
+}
+
 scoped_ptr<RenderPassDrawQuad> RenderPassDrawQuad::Create() {
     return make_scoped_ptr(new RenderPassDrawQuad);
 }
@@ -19,44 +22,50 @@ scoped_ptr<RenderPassDrawQuad> RenderPassDrawQuad::Create() {
 scoped_ptr<RenderPassDrawQuad> RenderPassDrawQuad::Copy(
     const SharedQuadState* copied_shared_quad_state,
     RenderPass::Id copied_render_pass_id) const {
-  scoped_ptr<RenderPassDrawQuad> copy_quad(new RenderPassDrawQuad(*MaterialCast(this)));
+  scoped_ptr<RenderPassDrawQuad> copy_quad(
+      new RenderPassDrawQuad(*MaterialCast(this)));
   copy_quad->shared_quad_state = copied_shared_quad_state;
   copy_quad->render_pass_id = copied_render_pass_id;
   return copy_quad.Pass();
 }
 
-void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
-                                gfx::Rect rect,
-                                RenderPass::Id render_pass_id,
-                                bool is_replica,
-                                ResourceProvider::ResourceId mask_resource_id,
-                                gfx::Rect contents_changed_since_last_frame,
-                                gfx::RectF mask_uv_rect) {
+void RenderPassDrawQuad::SetNew(
+    const SharedQuadState* shared_quad_state,
+    gfx::Rect rect,
+    RenderPass::Id render_pass_id,
+    bool is_replica,
+    ResourceProvider::ResourceId mask_resource_id,
+    gfx::Rect contents_changed_since_last_frame,
+    gfx::RectF mask_uv_rect,
+    const WebKit::WebFilterOperations& filters,
+    skia::RefPtr<SkImageFilter> filter,
+    const WebKit::WebFilterOperations& background_filters) {
   DCHECK(render_pass_id.layer_id > 0);
   DCHECK(render_pass_id.index >= 0);
 
   gfx::Rect opaque_rect;
   gfx::Rect visible_rect = rect;
   bool needs_blending = false;
-  DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
-                   visible_rect, needs_blending);
-  this->render_pass_id = render_pass_id;
-  this->is_replica = is_replica;
-  this->mask_resource_id = mask_resource_id;
-  this->contents_changed_since_last_frame = contents_changed_since_last_frame;
-  this->mask_uv_rect = mask_uv_rect;
+  SetAll(shared_quad_state, rect, opaque_rect, visible_rect, needs_blending,
+         render_pass_id, is_replica, mask_resource_id,
+         contents_changed_since_last_frame, mask_uv_rect, filters, filter,
+         background_filters);
 }
 
-void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
-                                gfx::Rect rect,
-                                gfx::Rect opaque_rect,
-                                gfx::Rect visible_rect,
-                                bool needs_blending,
-                                RenderPass::Id render_pass_id,
-                                bool is_replica,
-                                ResourceProvider::ResourceId mask_resource_id,
-                                gfx::Rect contents_changed_since_last_frame,
-                                gfx::RectF mask_uv_rect) {
+void RenderPassDrawQuad::SetAll(
+    const SharedQuadState* shared_quad_state,
+    gfx::Rect rect,
+    gfx::Rect opaque_rect,
+    gfx::Rect visible_rect,
+    bool needs_blending,
+    RenderPass::Id render_pass_id,
+    bool is_replica,
+    ResourceProvider::ResourceId mask_resource_id,
+    gfx::Rect contents_changed_since_last_frame,
+    gfx::RectF mask_uv_rect,
+    const WebKit::WebFilterOperations& filters,
+    skia::RefPtr<SkImageFilter> filter,
+    const WebKit::WebFilterOperations& background_filters) {
   DCHECK(render_pass_id.layer_id > 0);
   DCHECK(render_pass_id.index >= 0);
 
@@ -67,6 +76,9 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
   this->mask_resource_id = mask_resource_id;
   this->contents_changed_since_last_frame = contents_changed_since_last_frame;
   this->mask_uv_rect = mask_uv_rect;
+  this->filters = filters;
+  this->filter = filter;
+  this->background_filters = background_filters;
 }
 
 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(