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

1 files changed, 4 insertions, 5 deletions

diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index 0044f6a..b2045d7 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -88,14 +88,14 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
   scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
   quad->SetNew(shared_state, output_rect, contributing_pass->id, false, 0,
                output_rect, gfx::RectF(), FilterOperations(),
-               skia::RefPtr<SkImageFilter>(), FilterOperations());
+               FilterOperations());
   quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
 }
 
 void AddRenderPassQuad(TestRenderPass* to_pass,
                        TestRenderPass* contributing_pass,
                        ResourceProvider::ResourceId mask_resource_id,
-                       skia::RefPtr<SkImageFilter> filter,
+                       const FilterOperations& filters,
                        gfx::Transform transform) {
   MockQuadCuller quad_sink(&to_pass->quad_list,
                            &to_pass->shared_quad_state_list);
@@ -107,9 +107,8 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
         transform, output_rect.size(), output_rect, output_rect, false, 1);
   scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
   quad->SetNew(shared_state, output_rect, contributing_pass->id, false,
-               mask_resource_id, output_rect, gfx::RectF(),
-               FilterOperations(),
-               filter, FilterOperations());
+               mask_resource_id, output_rect, gfx::RectF(), filters,
+               FilterOperations());
   quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
 }