Index: cc/output/renderer_pixeltest.cc |
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc |
index daa503912bebda3f4bda3d1ffc7b383ed33c4c83..ebe2a5f2c03be3cee23d38ac456915ce9080dbff 100644 |
--- a/cc/output/renderer_pixeltest.cc |
+++ b/cc/output/renderer_pixeltest.cc |
@@ -90,7 +90,6 @@ scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad( |
rect, // contents_changed_since_last_frame |
gfx::RectF(), // mask_uv_rect |
FilterOperations(), // foreground filters |
- skia::RefPtr<SkImageFilter>(), // foreground filter |
FilterOperations()); // background filters |
return quad.PassAs<DrawQuad>(); |
@@ -622,6 +621,8 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) { |
new SkColorMatrixFilter(matrix))); |
skia::RefPtr<SkImageFilter> filter = |
skia::AdoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), NULL)); |
+ FilterOperations filters; |
+ filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
scoped_ptr<RenderPassDrawQuad> render_pass_quad = |
RenderPassDrawQuad::Create(); |
@@ -632,8 +633,7 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) { |
0, |
pass_rect, |
gfx::RectF(), |
- FilterOperations(), |
- filter, |
+ filters, |
FilterOperations()); |
root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>()); |
@@ -725,6 +725,8 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) { |
new SkColorMatrixFilter(matrix))); |
skia::RefPtr<SkImageFilter> filter = |
skia::AdoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), NULL)); |
+ FilterOperations filters; |
+ filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
scoped_ptr<RenderPassDrawQuad> render_pass_quad = |
RenderPassDrawQuad::Create(); |
@@ -735,8 +737,7 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) { |
0, |
pass_rect, |
gfx::RectF(), |
- FilterOperations(), |
- filter, |
+ filters, |
FilterOperations()); |
root_pass->quad_list.push_back(render_pass_quad.PassAs<DrawQuad>()); |
@@ -930,7 +931,6 @@ class RendererPixelTestWithBackgroundFilter |
filter_pass_content_rect_, // contents_changed_since_last_frame |
gfx::RectF(), // mask_uv_rect |
FilterOperations(), // filters |
- skia::RefPtr<SkImageFilter>(), // filter |
this->background_filters_); |
root_pass->quad_list.push_back(filter_pass_quad.PassAs<DrawQuad>()); |
root_pass->shared_quad_state_list.push_back(shared_state.Pass()); |