commit bdf5433ab49b00df7c0f9185a68fc39f74cda409
author Ben Wagner <bungeman@google.com> Tue May 15 14:12:14 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 16 18:53:12 2018 +0000
tree fec7980683ba47019b3100161c95185bb6ba4294
parent 94f585ed091e252cd3cc741b19c8a226fe4a5eec

SkImage::onRefEncoded to return sk_sp.

This changes SkImage::onRefEncoded and downstack calls to return sk_sp.
All of the values returned are already sk_sp, so this just updates the
API. This change is currently behind the new flag
SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE so that Chromium can be updated.

Change-Id: Ic53a88ae23fa8b3b41b84c4abdc4b74e9879da38
Reviewed-on: https://skia-review.googlesource.com/128311
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/codec/SkCodecImageGenerator.h

diff --git a/src/codec/SkCodecImageGenerator.h b/src/codec/SkCodecImageGenerator.h
index 1b2cbc2..e608d8e 100644
--- a/src/codec/SkCodecImageGenerator.h
+++ b/src/codec/SkCodecImageGenerator.h
@@ -21,7 +21,11 @@
     static std::unique_ptr<SkImageGenerator> MakeFromEncodedCodec(sk_sp<SkData>);
 
 protected:
+#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE
     SkData* onRefEncodedData() override;
+#else
+    sk_sp<SkData> onRefEncodedData() override;
+#endif
 
     bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& opts)
                      override;