| 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..6884a65564c8333fde0d16ca7ea5f78eddb4ccc6 100644
|
| --- a/cc/quads/render_pass_draw_quad.cc
|
| +++ b/cc/quads/render_pass_draw_quad.cc
|
| @@ -14,7 +14,6 @@ namespace cc {
|
|
|
| RenderPassDrawQuad::RenderPassDrawQuad()
|
| : render_pass_id(RenderPass::Id(-1, -1)),
|
| - is_replica(false),
|
| mask_resource_id(static_cast<ResourceProvider::ResourceId>(-1)) {
|
| }
|
|
|
| @@ -26,9 +25,7 @@ void RenderPassDrawQuad::SetNew(
|
| const gfx::Rect& rect,
|
| const gfx::Rect& visible_rect,
|
| RenderPass::Id render_pass_id,
|
| - bool is_replica,
|
| ResourceProvider::ResourceId mask_resource_id,
|
| - const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| const FilterOperations& background_filters) {
|
| @@ -37,9 +34,15 @@ void RenderPassDrawQuad::SetNew(
|
|
|
| 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,
|
| + mask_resource_id,
|
| + mask_uv_rect,
|
| + filters,
|
| background_filters);
|
| }
|
|
|
| @@ -50,9 +53,7 @@ void RenderPassDrawQuad::SetAll(
|
| const gfx::Rect& visible_rect,
|
| bool needs_blending,
|
| RenderPass::Id render_pass_id,
|
| - bool is_replica,
|
| ResourceProvider::ResourceId mask_resource_id,
|
| - const gfx::Rect& contents_changed_since_last_frame,
|
| const gfx::RectF& mask_uv_rect,
|
| const FilterOperations& filters,
|
| const FilterOperations& background_filters) {
|
| @@ -62,9 +63,7 @@ void RenderPassDrawQuad::SetAll(
|
| 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;
|
| this->filters = filters;
|
| this->background_filters = background_filters;
|
| @@ -84,11 +83,7 @@ const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
|
|
|
| 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();
|
|
|
| value->BeginArray("mask_uv_rect");
|
| MathUtil::AddToTracedValue(mask_uv_rect, value);
|
|
|