commit 185130c643f0f6b20dcf14c200074748be282a7e
author Mike Reed <reed@google.com> Wed Feb 15 15:14:16 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 15 20:51:28 2017 +0000
tree 049a9162c7ed7c298a4966000b9aa805f75282ad
parent eb62829a83a0a4f4fdd1230a3c08140e38052602

return and take SkImageGenerator as unique_ptr

BUG=skia:

Change-Id: I4bc11042dd1dbf1eabd40af206027bc65acc3186
Reviewed-on: https://skia-review.googlesource.com/8444
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

include/core/SkGraphics.h

diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h
index d5a730d..bf8228b 100644
--- a/include/core/SkGraphics.h
+++ b/include/core/SkGraphics.h
@@ -8,7 +8,7 @@
 #ifndef SkGraphics_DEFINED
 #define SkGraphics_DEFINED
 
-#include "SkTypes.h"
+#include "SkRefCnt.h"
 
 class SkData;
 class SkImageGenerator;
@@ -157,7 +157,8 @@
      */
     static void SetTLSFontCacheLimit(size_t bytes);
 
-    typedef SkImageGenerator* (*ImageGeneratorFromEncodedFactory)(SkData*);
+    typedef std::unique_ptr<SkImageGenerator>
+                                            (*ImageGeneratorFromEncodedDataFactory)(sk_sp<SkData>);
 
     /**
      *  To instantiate images from encoded data, first looks at this runtime function-ptr. If it
@@ -166,8 +167,15 @@
      *
      *  Returns the previous factory (which could be NULL).
      */
+    static ImageGeneratorFromEncodedDataFactory
+                    SetImageGeneratorFromEncodedDataFactory(ImageGeneratorFromEncodedDataFactory);
+
+#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
+    typedef SkImageGenerator* (*ImageGeneratorFromEncodedFactory)(SkData*);
     static ImageGeneratorFromEncodedFactory
-           SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
+                            SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
+#endif
+
 };
 
 class SkAutoGraphics {