Use sk_sp-based APIs for SkColorFilter

third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp

Index: third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp
index 8c09a88049f85c9a8415e881d57def5cc09468a3..beda60a0349bf1781aba1c8d95e0323db0a805ae 100644
--- a/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp
+++ b/third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp
@@ -118,7 +118,7 @@ static void luminanceToAlphaMatrix(SkScalar matrix[kColorMatrixSize])
     matrix[17] = 0.0721f;
 }
 
-static SkColorFilter* createColorFilter(ColorMatrixType type, const Vector<float>& values)
+static sk_sp<SkColorFilter> createColorFilter(ColorMatrixType type, const Vector<float>& values)
 {
     // Use defaults if values contains too few/many values.
     SkScalar matrix[kColorMatrixSize];
@@ -150,7 +150,7 @@ static SkColorFilter* createColorFilter(ColorMatrixType type, const Vector<float
         luminanceToAlphaMatrix(matrix);
         break;
     }
-    return SkColorMatrixFilter::Create(matrix);
+    return SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
 }
 
 bool FEColorMatrix::affectsTransparentPixels()
@@ -163,9 +163,9 @@ bool FEColorMatrix::affectsTransparentPixels()
 PassRefPtr<SkImageFilter> FEColorMatrix::createImageFilter(SkiaImageFilterBuilder& builder)
 {
     RefPtr<SkImageFilter> input(builder.build(inputEffect(0), operatingColorSpace()));
-    SkAutoTUnref<SkColorFilter> filter(createColorFilter(m_type, m_values));
+    auto filter = createColorFilter(m_type, m_values);

[f(malita), 2016/03/26 14:16:49]

Dana pointed out on a different CL that Chromium style doesn't approve of auto
for smart pointers.

I'm not familiar with the original motivation, but this pattern did seem kind of
fragile to me when seen in Skia.

We should probably stick to Chromium style in Blink (and maybe consider for Skia
also).

[tomhudson, 2016/03/28 13:11:17]

Done.

Yay! I'm not fond of auto but having seen it introduced so heavily in Skia
recently thought it was part of the house style.

     SkImageFilter::CropRect rect = getCropRect();
-    return adoptRef(SkColorFilterImageFilter::Create(filter, input.get(), &rect));
+    return adoptRef(SkColorFilterImageFilter::Create(filter.get(), input.get(), &rect));
 }
 
 static TextStream& operator<<(TextStream& ts, const ColorMatrixType& type)