Chromium Code Reviews Chromium Code Reviews
Issue 11618026:
Move filters to RenderPassDrawQuad (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: cc/render_pass_draw_quad.cc |
| diff --git a/cc/render_pass_draw_quad.cc b/cc/render_pass_draw_quad.cc |
| index f0ae447b5ceed2dab0001570b2845b49a47b8a24..7f01ac299029407fd5116cdb33b0b4baa8845a50 100644 |
| --- a/cc/render_pass_draw_quad.cc |
| +++ b/cc/render_pass_draw_quad.cc |
| @@ -31,20 +31,20 @@ void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state, |
| bool is_replica, |
| ResourceProvider::ResourceId mask_resource_id, |
| gfx::Rect contents_changed_since_last_frame, |
| - gfx::RectF mask_uv_rect) { |
| + gfx::RectF mask_uv_rect, |
| + const WebKit::WebFilterOperations& filters, |
| + skia::RefPtr<SkImageFilter> filter, |
| + const WebKit::WebFilterOperations& background_filters) { |
|
danakj
2012/12/19 21:22:52
80 cols, i guess wrap at the SetNew(\n
piman
2012/12/19 21:50:00
Done.
|
| DCHECK(render_pass_id.layer_id > 0); |
| DCHECK(render_pass_id.index >= 0); |
| gfx::Rect opaque_rect; |
| gfx::Rect visible_rect = rect; |
| bool needs_blending = false; |
| - 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; |
| + 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, |
| + background_filters); |
| } |
| void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
| @@ -56,7 +56,10 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
| bool is_replica, |
| ResourceProvider::ResourceId mask_resource_id, |
| gfx::Rect contents_changed_since_last_frame, |
| - gfx::RectF mask_uv_rect) { |
| + gfx::RectF mask_uv_rect, |
| + const WebKit::WebFilterOperations& filters, |
| + skia::RefPtr<SkImageFilter> filter, |
| + const WebKit::WebFilterOperations& background_filters) { |
|
danakj
2012/12/19 21:22:52
80 cols here too
piman
2012/12/19 21:50:00
Done.
|
| DCHECK(render_pass_id.layer_id > 0); |
| DCHECK(render_pass_id.index >= 0); |
| @@ -67,6 +70,9 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
| 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->filter = filter; |
| + this->background_filters = background_filters; |
| } |
| const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast( |
