Chromium Code Reviews| Index: cc/output/renderer_pixeltest.cc |
| diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc |
| index 5451829e117a5b6244b4a5c39ce1376459ada90c..0cd96c84a5a7543e6680db6c7dd2c29917758ada 100644 |
| --- a/cc/output/renderer_pixeltest.cc |
| +++ b/cc/output/renderer_pixeltest.cc |
| @@ -1390,12 +1390,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) { |
| matrix[13] = matrix[14] = 0; |
| matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0; |
| matrix[18] = 1; |
| - sk_sp<SkColorFilter> color_filter = |
| - SkColorFilter::MakeMatrixFilterRowMajor255(matrix); |
| - skia::RefPtr<SkImageFilter> filter = skia::AdoptRef( |
| - SkColorFilterImageFilter::Create(color_filter.get(), NULL)); |
| FilterOperations filters; |
| - filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
| + filters.Append( |
| + FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make( |
| + SkColorFilter::MakeMatrixFilterRowMajor255(matrix), NULL))); |
|
danakj
2016/04/25 22:06:23
nit: nullptr
tomhudson
2016/04/27 12:06:47
Done.
|
| RenderPassDrawQuad* render_pass_quad = |
| root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
| @@ -1629,12 +1627,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) { |
| matrix[14] = 1.5f; |
| matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0; |
| matrix[18] = 1; |
| - sk_sp<SkColorFilter> color_filter = |
| - SkColorFilter::MakeMatrixFilterRowMajor255(matrix); |
| - skia::RefPtr<SkImageFilter> filter = skia::AdoptRef( |
| - SkColorFilterImageFilter::Create(color_filter.get(), NULL)); |
| FilterOperations filters; |
| - filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
| + filters.Append( |
| + FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make( |
| + SkColorFilter::MakeMatrixFilterRowMajor255(matrix), NULL))); |
|
danakj
2016/04/25 22:06:23
nit: nullptr
tomhudson
2016/04/27 12:06:47
Done.
|
| RenderPassDrawQuad* render_pass_quad = |
| root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |