diff options
author | Ben Wagner <bungeman@google.com> | 2018-05-15 14:12:14 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-16 18:53:12 +0000 |
commit | bdf5433ab49b00df7c0f9185a68fc39f74cda409 (patch) | |
tree | fec7980683ba47019b3100161c95185bb6ba4294 /src/codec | |
parent | 94f585ed091e252cd3cc741b19c8a226fe4a5eec (diff) |
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>
Diffstat (limited to 'src/codec')
-rw-r--r-- | src/codec/SkCodecImageGenerator.cpp | 6 | ||||
-rw-r--r-- | src/codec/SkCodecImageGenerator.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/codec/SkCodecImageGenerator.cpp b/src/codec/SkCodecImageGenerator.cpp index 3f03b2f03e..65702616a3 100644 --- a/src/codec/SkCodecImageGenerator.cpp +++ b/src/codec/SkCodecImageGenerator.cpp @@ -35,9 +35,15 @@ SkCodecImageGenerator::SkCodecImageGenerator(std::unique_ptr<SkCodec> codec, sk_ , fData(std::move(data)) {} +#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE SkData* SkCodecImageGenerator::onRefEncodedData() { return SkRef(fData.get()); } +#else +sk_sp<SkData> SkCodecImageGenerator::onRefEncodedData() { + return fData; +} +#endif bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& requestInfo, void* requestPixels, size_t requestRowBytes, const Options& opts) { diff --git a/src/codec/SkCodecImageGenerator.h b/src/codec/SkCodecImageGenerator.h index 1b2cbc28b2..e608d8e717 100644 --- a/src/codec/SkCodecImageGenerator.h +++ b/src/codec/SkCodecImageGenerator.h @@ -21,7 +21,11 @@ public: 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; |