| Index: cc/output/renderer_pixeltest.cc
|
| diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
|
| index e8d13237208d17442ad59c9eb7018673586b4664..79f08307743f2e3dd4cc2da0fb86eb9ddf8d9983 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>();
|
| @@ -617,6 +616,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();
|
| @@ -627,8 +628,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>());
|
| @@ -720,6 +720,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();
|
| @@ -730,8 +732,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>());
|
| @@ -925,7 +926,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());
|
|
|