Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp

include/core/SkImageFilter.h

Index: include/core/SkImageFilter.h
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index f4273cb8da237a46ce448a27a6c8cbbcec915be0..ab72547fed5f61c1a9e9522aab683e461e978e96 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -255,13 +255,7 @@
      *  If this filter can be represented by another filter + a localMatrix, return that filter,
      *  else return null.
      */
-    sk_sp<SkImageFilter> makeWithLocalMatrix(const SkMatrix&) const;
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const {
-        this->makeWithLocalMatrix(matrix).release();
-    }
-#endif
+    SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const;
 
     /**
      * Create an SkMatrixImageFilter, which transforms its input by the given matrix.
@@ -326,9 +320,7 @@
         void allocInputs(int count);
     };
 
-    SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect = nullptr);
-
-    SkImageFilter(sk_sp<SkImageFilter>* inputs, int inputCount, const CropRect* cropRect);
+    SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect = NULL);
 
     virtual ~SkImageFilter();