| 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 380f2f6619337e1d8af761f148c32adff1df537e..bcafb03c462ec36f41e3611a438b525691551368 100644
|
| --- a/cc/quads/render_pass_draw_quad.cc
|
| +++ b/cc/quads/render_pass_draw_quad.cc
|
| @@ -31,15 +31,25 @@ void RenderPassDrawQuad::SetNew(
|
| const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| + const gfx::Vector2dF& filters_scale,
|
| const FilterOperations& background_filters) {
|
| DCHECK_GT(render_pass_id.layer_id, 0);
|
| DCHECK_GE(render_pass_id.index, 0);
|
|
|
| gfx::Rect opaque_rect;
|
| 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,
|
| + 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,
|
| + filters_scale,
|
| background_filters);
|
| }
|
|
|
| @@ -55,6 +65,7 @@ void RenderPassDrawQuad::SetAll(
|
| const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| + const gfx::Vector2dF& filters_scale,
|
| const FilterOperations& background_filters) {
|
| DCHECK_GT(render_pass_id.layer_id, 0);
|
| DCHECK_GE(render_pass_id.index, 0);
|
| @@ -67,6 +78,7 @@ 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->filters_scale = filters_scale;
|
| this->background_filters = background_filters;
|
| }
|
|
|
| @@ -86,6 +98,7 @@ void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
|
| TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
|
| value->SetBoolean("is_replica", is_replica);
|
| value->SetInteger("mask_resource_id", mask_resource_id);
|
| +
|
| value->BeginArray("contents_changed_since_last_frame");
|
| MathUtil::AddToTracedValue(contents_changed_since_last_frame, value);
|
| value->EndArray();
|
| @@ -93,10 +106,15 @@ void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
|
| value->BeginArray("mask_uv_rect");
|
| MathUtil::AddToTracedValue(mask_uv_rect, value);
|
| value->EndArray();
|
| +
|
| value->BeginDictionary("filters");
|
| filters.AsValueInto(value);
|
| value->EndDictionary();
|
|
|
| + value->BeginArray("filters_scale");
|
| + MathUtil::AddToTracedValue(filters_scale, value);
|
| + value->EndArray();
|
| +
|
| value->BeginDictionary("background_filters");
|
| background_filters.AsValueInto(value);
|
| value->EndDictionary();
|
|
|