change flattenable factory to return sk_sp

include/core/SkFlattenable.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFlattenable_DEFINED
 #define SkFlattenable_DEFINED
 
@@ skipping 30 matching lines @@
 
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END \
     }
 
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
     SkFlattenable::Register(#flattenable, flattenable::CreateProc, \
                             flattenable::GetFlattenableType());
 
 #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable)    \
     private:                                                                \
-    static SkFlattenable* CreateProc(SkReadBuffer&);                        \
+    static sk_sp<SkFlattenable> CreateProc(SkReadBuffer&);                        \
     friend class SkFlattenable::PrivateInitializer;                         \
     public:                                                                 \
     Factory getFactory() const override { return CreateProc; }
 
 /** For SkFlattenable derived objects with a valid type
     This macro should only be used in base class objects in core
   */
 #define SK_DEFINE_FLATTENABLE_TYPE(flattenable) \
     static Type GetFlattenableType() { \
         return k##flattenable##_Type; \
@@ skipping 13 matching lines @@
         kSkImageFilter_Type,
         kSkMaskFilter_Type,
         kSkPathEffect_Type,
         kSkPixelRef_Type,
         kSkRasterizer_Type,
         kSkShader_Type,
         kSkUnused_Type,     // used to be SkUnitMapper
         kSkXfermode_Type,
     };
 
-    typedef SkFlattenable* (*Factory)(SkReadBuffer&);
+    typedef sk_sp<SkFlattenable> (*Factory)(SkReadBuffer&);
 
     SkFlattenable() {}
 
     /** Implement this to return a factory function pointer that can be called
      to recreate your class given a buffer (previously written to by your
      override of flatten().
      */
     virtual Factory getFactory() const = 0;
 
     /** Returns the name of the object's class
@@ skipping 21 matching lines @@
 
 private:
     static void InitializeFlattenablesIfNeeded();
 
     friend class SkGraphics;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif