| 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 91cb6aaa3e0350796c8835a8b85e3b4c64ee35e6..b05e8d35f6ab5ab9c47403f9ca15f65316632add 100644
|
| --- a/cc/quads/render_pass_draw_quad.cc
|
| +++ b/cc/quads/render_pass_draw_quad.cc
|
| @@ -44,16 +44,26 @@ void RenderPassDrawQuad::SetNew(
|
| const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| - const FilterOperations& background_filters) {
|
| + const FilterOperations& background_filters,
|
| + const gfx::Vector2dF& scale) {
|
| 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,
|
| - background_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,
|
| + background_filters,
|
| + scale);
|
| }
|
|
|
| void RenderPassDrawQuad::SetAll(
|
| @@ -68,7 +78,8 @@ void RenderPassDrawQuad::SetAll(
|
| const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| - const FilterOperations& background_filters) {
|
| + const FilterOperations& background_filters,
|
| + const gfx::Vector2dF& scale) {
|
| DCHECK_GT(render_pass_id.layer_id, 0);
|
| DCHECK_GE(render_pass_id.index, 0);
|
|
|
| @@ -81,6 +92,7 @@ void RenderPassDrawQuad::SetAll(
|
| this->mask_uv_rect = mask_uv_rect;
|
| this->filters = filters;
|
| this->background_filters = background_filters;
|
| + this->scale = scale;
|
| }
|
|
|
| void RenderPassDrawQuad::IterateResources(
|
| @@ -105,6 +117,7 @@ void RenderPassDrawQuad::ExtendValue(base::DictionaryValue* value) const {
|
| value->Set("mask_uv_rect", MathUtil::AsValue(mask_uv_rect).release());
|
| value->Set("filters", filters.AsValue().release());
|
| value->Set("background_filters", background_filters.AsValue().release());
|
| + value->Set("scale", MathUtil::AsValue(scale).release());
|
| }
|
|
|
| } // namespace cc
|
|
|