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

src/core/SkModeColorFilter.cpp

Index: src/core/SkModeColorFilter.cpp
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index 3da51609a3a4dbadaef747332fe19d8f75ab9a10..1e104d8dc77856b7ba07940769836e9a0e444025 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -80,7 +80,7 @@
 SkFlattenable* SkModeColorFilter::CreateProc(SkReadBuffer& buffer) {
     SkColor color = buffer.readColor();
     SkXfermode::Mode mode = (SkXfermode::Mode)buffer.readUInt();
-    return SkColorFilter::MakeModeFilter(color, mode).release();
+    return SkColorFilter::CreateModeFilter(color, mode);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -148,7 +148,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkColorFilter> SkColorFilter::MakeModeFilter(SkColor color, SkXfermode::Mode mode) {
+SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode mode) {
     if (!SkIsValidMode(mode)) {
         return nullptr;
     }
@@ -183,10 +183,10 @@
 
     switch (mode) {
         case SkXfermode::kSrc_Mode:
-            return sk_make_sp<Src_SkModeColorFilter>(color);
+            return new Src_SkModeColorFilter(color);
         case SkXfermode::kSrcOver_Mode:
-            return sk_make_sp<SrcOver_SkModeColorFilter>(color);
+            return new SrcOver_SkModeColorFilter(color);
         default:
-            return SkModeColorFilter::Make(color, mode);
+            return SkModeColorFilter::Create(color, mode);
     }
 }