Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

src/core/SkColorMatrixFilterRowMajor255.h

Index: src/core/SkColorMatrixFilterRowMajor255.h
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h
index 0ad64fa2f0ed8e1a1f1f6c700d1fd173ade04d38..106d2bd882a798886824c050526a1ba70f7f0e48 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.h
+++ b/src/core/SkColorMatrixFilterRowMajor255.h
@@ -12,17 +12,16 @@
 
 class SK_API SkColorMatrixFilterRowMajor255 : public SkColorFilter {
 public:
-    SkColorMatrixFilterRowMajor255() {};
     explicit SkColorMatrixFilterRowMajor255(const SkScalar array[20]);
 
     /** Creates a color matrix filter that returns the same value in all four channels. */
-    static sk_sp<SkColorFilter> MakeSingleChannelOutput(const SkScalar row[5]);
+    static SkColorFilter* CreateSingleChannelOutput(const SkScalar row[5]);
 
     void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
     void filterSpan4f(const SkPM4f src[], int count, SkPM4f[]) const override;
     uint32_t getFlags() const override;
     bool asColorMatrix(SkScalar matrix[20]) const override;
-    sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter>) const override;
+    SkColorFilter* newComposed(const SkColorFilter*) const override;
 
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
@@ -36,6 +35,8 @@
     void flatten(SkWriteBuffer&) const override;
 
 private:
+    SkColorMatrixFilterRowMajor255() {};
+
     SkScalar        fMatrix[20];
     float           fTranspose[20]; // for Sk4s
     uint32_t        fFlags;