diff options
author | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 04:41:48 +0000 |
---|---|---|
committer | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 04:41:48 +0000 |
commit | 1dc7943effc15784acb0050a0402fe98e7547a2e (patch) | |
tree | 40ca6ee1c7995e356968bf3608d4e76194d00363 /cc/quads/render_pass_draw_quad.cc | |
parent | 152f9ae8bdf8e828d016d9d1e58530bc8311bb70 (diff) | |
download | chromium_src-1dc7943effc15784acb0050a0402fe98e7547a2e.zip chromium_src-1dc7943effc15784acb0050a0402fe98e7547a2e.tar.gz chromium_src-1dc7943effc15784acb0050a0402fe98e7547a2e.tar.bz2 |
Add support for converting cc::FilterOperations into an SkImageFilter
This defines a new type of cc::FilterOperation for reference filters, and
defines a method (RenderSurfaceFilters::BuildImageFilter) that builds an
SkImageFilter from a given cc::FilterOperations.
This also removes cc::Layer::SetFilter and cc::LayerImpl::SetFilter.
These were only used when we had a reference filter, but they are no
longer needed now that reference filters can be included in
FilterOperations.
BUG=181613
Review URL: https://codereview.chromium.org/21154002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads/render_pass_draw_quad.cc')
-rw-r--r-- | cc/quads/render_pass_draw_quad.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc index 73b2553..af8cd8c 100644 --- a/cc/quads/render_pass_draw_quad.cc +++ b/cc/quads/render_pass_draw_quad.cc @@ -43,7 +43,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); @@ -53,7 +52,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); } @@ -69,7 +68,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); @@ -82,7 +80,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; } @@ -107,9 +104,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()); } |