| Index: cc/quads/render_pass_draw_quad.cc
|
| diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc
|
| index 0528cd5e34f8e1ff0ff2e88e0ec33c574a040003..7246d5fa99f0d8b4485d279783eaf1b041636cd9 100644
|
| --- a/cc/quads/render_pass_draw_quad.cc
|
| +++ b/cc/quads/render_pass_draw_quad.cc
|
| @@ -42,7 +42,6 @@ void RenderPassDrawQuad::SetNew(
|
| gfx::Rect contents_changed_since_last_frame,
|
| gfx::RectF mask_uv_rect,
|
| const FilterOperations& filters,
|
| - skia::RefPtr<SkImageFilter> filter,
|
| const FilterOperations& background_filters) {
|
| DCHECK_GT(render_pass_id.layer_id, 0);
|
| DCHECK_GE(render_pass_id.index, 0);
|
| @@ -52,7 +51,7 @@ void RenderPassDrawQuad::SetNew(
|
| bool needs_blending = false;
|
| 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,
|
| + contents_changed_since_last_frame, mask_uv_rect, filters,
|
| background_filters);
|
| }
|
|
|
| @@ -68,7 +67,6 @@ void RenderPassDrawQuad::SetAll(
|
| gfx::Rect contents_changed_since_last_frame,
|
| gfx::RectF mask_uv_rect,
|
| const FilterOperations& filters,
|
| - skia::RefPtr<SkImageFilter> filter,
|
| const FilterOperations& background_filters) {
|
| DCHECK_GT(render_pass_id.layer_id, 0);
|
| DCHECK_GE(render_pass_id.index, 0);
|
| @@ -81,7 +79,6 @@ void RenderPassDrawQuad::SetAll(
|
| 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;
|
| }
|
|
|
| @@ -106,9 +103,6 @@ void RenderPassDrawQuad::ExtendValue(base::DictionaryValue* value) const {
|
| MathUtil::AsValue(contents_changed_since_last_frame).release());
|
| value->Set("mask_uv_rect", MathUtil::AsValue(mask_uv_rect).release());
|
| value->Set("filters", filters.AsValue().release());
|
| - // TODO(piman): dump SkImageFilters rather than just indicating if there are
|
| - // any or not.
|
| - value->SetBoolean("has_filter", !!filter);
|
| value->Set("background_filters", background_filters.AsValue().release());
|
| }
|
|
|
|
|