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

include/core/SkShader.h

Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index e2ebda5f1018218806cd49f56d1c644e2c3101d2..c9c760d06d9ed01e897c41a4cb1e615f35f0a83d 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -359,7 +359,7 @@
      *  Create a new shader that produces the same colors as invoking this shader and then applying
      *  the colorfilter.
      */
-    sk_sp<SkShader> makeWithColorFilter(sk_sp<SkColorFilter>) const;
+    sk_sp<SkShader> makeWithColorFilter(SkColorFilter*) const;
 
     //////////////////////////////////////////////////////////////////////////
     //  Factory methods for stock shaders
@@ -393,7 +393,9 @@
     SkShader* newWithLocalMatrix(const SkMatrix& matrix) const {
         return this->makeWithLocalMatrix(matrix).release();
     }
-    SkShader* newWithColorFilter(SkColorFilter* filter) const;
+    SkShader* newWithColorFilter(SkColorFilter* filter) const {
+        return this->makeWithColorFilter(filter).release();
+    }
 #endif
 
     /**