From bdf5433ab49b00df7c0f9185a68fc39f74cda409 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 15 May 2018 14:12:14 -0400 Subject: 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 Commit-Queue: Ben Wagner --- src/ports/SkImageGeneratorCG.cpp | 6 ++++++ src/ports/SkImageGeneratorCG.h | 4 ++++ src/ports/SkImageGeneratorWIC.cpp | 6 ++++++ src/ports/SkImageGeneratorWIC.h | 4 ++++ 4 files changed, 20 insertions(+) (limited to 'src/ports') diff --git a/src/ports/SkImageGeneratorCG.cpp b/src/ports/SkImageGeneratorCG.cpp index 2d2c3d3bd5..c3d2f77cfe 100644 --- a/src/ports/SkImageGeneratorCG.cpp +++ b/src/ports/SkImageGeneratorCG.cpp @@ -97,9 +97,15 @@ SkImageGeneratorCG::SkImageGeneratorCG(const SkImageInfo& info, const void* imag , fOrigin(origin) {} +#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE SkData* SkImageGeneratorCG::onRefEncodedData() { return SkRef(fData.get()); } +#else +sk_sp SkImageGeneratorCG::onRefEncodedData() { + return fData; +} +#endif bool SkImageGeneratorCG::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&) { diff --git a/src/ports/SkImageGeneratorCG.h b/src/ports/SkImageGeneratorCG.h index 58aac4f01a..4f5a3a98b3 100644 --- a/src/ports/SkImageGeneratorCG.h +++ b/src/ports/SkImageGeneratorCG.h @@ -27,7 +27,11 @@ public: static std::unique_ptr MakeFromEncodedCG(sk_sp); protected: +#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE SkData* onRefEncodedData() override; +#else + sk_sp onRefEncodedData() override; +#endif bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&) override; diff --git a/src/ports/SkImageGeneratorWIC.cpp b/src/ports/SkImageGeneratorWIC.cpp index e69b2ee2e9..19d4080960 100644 --- a/src/ports/SkImageGeneratorWIC.cpp +++ b/src/ports/SkImageGeneratorWIC.cpp @@ -132,9 +132,15 @@ SkImageGeneratorWIC::SkImageGeneratorWIC(const SkImageInfo& info, , fData(SkRef(data)) {} +#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE SkData* SkImageGeneratorWIC::onRefEncodedData() { return SkRef(fData.get()); } +#else +sk_sp SkImageGeneratorWIC::onRefEncodedData() { + return fData; +} +#endif bool SkImageGeneratorWIC::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&) { diff --git a/src/ports/SkImageGeneratorWIC.h b/src/ports/SkImageGeneratorWIC.h index 4770ee2111..c0ace676f4 100644 --- a/src/ports/SkImageGeneratorWIC.h +++ b/src/ports/SkImageGeneratorWIC.h @@ -39,7 +39,11 @@ public: static SkImageGenerator* NewFromEncodedWIC(SkData* data); protected: +#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE SkData* onRefEncodedData() override; +#else + sk_sp onRefEncodedData() override; +#endif bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&) override; -- cgit v1.2.3