cc: Move filters from RenderPassDrawQuad to RenderPass

cc/quads/render_pass_draw_quad.cc

 // Copyright 2011 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/quads/render_pass_draw_quad.h"
 
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/traced_value.h"
@@ skipping 11 matching lines @@
 RenderPassDrawQuad::~RenderPassDrawQuad() {
 }
 
 void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
                                 const gfx::Rect& rect,
                                 const gfx::Rect& visible_rect,
                                 int render_pass_id,
                                 ResourceId mask_resource_id,
                                 const gfx::Vector2dF& mask_uv_scale,
                                 const gfx::Size& mask_texture_size,
-                                const FilterOperations& filters,
                                 const gfx::Vector2dF& filters_scale,
-                                const gfx::PointF& filters_origin,
-                                const FilterOperations& background_filters) {
+                                const gfx::PointF& filters_origin) {
   DCHECK(render_pass_id);
 
   gfx::Rect opaque_rect;
   bool needs_blending = false;
   SetAll(shared_quad_state, rect, opaque_rect, visible_rect, needs_blending,
          render_pass_id, mask_resource_id, mask_uv_scale, mask_texture_size,
-         filters, filters_scale, filters_origin, background_filters);
+         filters_scale, filters_origin);
 }
 
 void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
                                 const gfx::Rect& rect,
                                 const gfx::Rect& opaque_rect,
                                 const gfx::Rect& visible_rect,
                                 bool needs_blending,
                                 int render_pass_id,
                                 ResourceId mask_resource_id,
                                 const gfx::Vector2dF& mask_uv_scale,
                                 const gfx::Size& mask_texture_size,
-                                const FilterOperations& filters,
                                 const gfx::Vector2dF& filters_scale,
-                                const gfx::PointF& filters_origin,
-                                const FilterOperations& background_filters) {
+                                const gfx::PointF& filters_origin) {
   DCHECK(render_pass_id);
 
   DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect,
                    visible_rect, needs_blending);
   this->render_pass_id = render_pass_id;
   resources.ids[kMaskResourceIdIndex] = mask_resource_id;
   resources.count = mask_resource_id ? 1 : 0;
   this->mask_uv_scale = mask_uv_scale;
   this->mask_texture_size = mask_texture_size;
-  this->filters = filters;
   this->filters_scale = filters_scale;
   this->filters_origin = filters_origin;
-  this->background_filters = background_filters;
 }
 
 gfx::RectF RenderPassDrawQuad::MaskUVRect() const {
   return gfx::ScaleRect(gfx::RectF(rect), mask_uv_scale.x(), mask_uv_scale.y());
 }
 
 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
     const DrawQuad* quad) {
   DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS);
   return static_cast<const RenderPassDrawQuad*>(quad);
 }
 
 void RenderPassDrawQuad::ExtendValue(
     base::trace_event::TracedValue* value) const {
   TracedValue::SetIDRef(reinterpret_cast<void*>(render_pass_id), value,
                         "render_pass_id");
   value->SetInteger("mask_resource_id", resources.ids[kMaskResourceIdIndex]);
   MathUtil::AddToTracedValue("mask_texture_size", mask_texture_size, value);
   MathUtil::AddToTracedValue("mask_uv_scale", mask_uv_scale, value);
-
-  value->BeginArray("filters");
-  filters.AsValueInto(value);
-  value->EndArray();
-  MathUtil::AddToTracedValue("filters_scale", filters_scale, value);
-
-  value->BeginDictionary("background_filters");
-  background_filters.AsValueInto(value);
-  value->EndDictionary();
 }
 
 }  // namespace cc