| Index: cc/output/renderer_pixeltest.cc
|
| diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
|
| index a953a927531426307a806a21b6e70ce9bef2a1f0..f1c3ebb393453f1995f2799c63269cd6c6c498a8 100644
|
| --- a/cc/output/renderer_pixeltest.cc
|
| +++ b/cc/output/renderer_pixeltest.cc
|
| @@ -1317,10 +1317,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
|
| matrix[13] = matrix[14] = 0;
|
| matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;
|
| matrix[18] = 1;
|
| - skia::RefPtr<SkColorFilter> colorFilter(
|
| - skia::AdoptRef(SkColorMatrixFilter::Create(matrix)));
|
| - skia::RefPtr<SkImageFilter> filter =
|
| - skia::AdoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), NULL));
|
| + 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));
|
|
|
| @@ -1556,10 +1556,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
|
| matrix[14] = 1.5f;
|
| matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;
|
| matrix[18] = 1;
|
| - skia::RefPtr<SkColorFilter> colorFilter(
|
| - skia::AdoptRef(SkColorMatrixFilter::Create(matrix)));
|
| - skia::RefPtr<SkImageFilter> filter =
|
| - skia::AdoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), NULL));
|
| + 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));
|
|
|
|
|