From e6c0fe0b8fb4fb66b0c8d3b3abac6257c3201f00 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 17 May 2018 11:58:38 -0400 Subject: Remove SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE. All implementers have been updated, so remove the flag and old code. Change-Id: Ie9747f37dd0ea3f1db682891bcae2496a470bc3a Reviewed-on: https://skia-review.googlesource.com/128883 Reviewed-by: Leon Scroggins Commit-Queue: Ben Wagner --- src/codec/SkCodecImageGenerator.cpp | 6 ------ src/codec/SkCodecImageGenerator.h | 4 ---- 2 files changed, 10 deletions(-) (limited to 'src/codec') diff --git a/src/codec/SkCodecImageGenerator.cpp b/src/codec/SkCodecImageGenerator.cpp index 65702616a3..286320c9cd 100644 --- a/src/codec/SkCodecImageGenerator.cpp +++ b/src/codec/SkCodecImageGenerator.cpp @@ -35,15 +35,9 @@ SkCodecImageGenerator::SkCodecImageGenerator(std::unique_ptr codec, sk_ , fData(std::move(data)) {} -#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE -SkData* SkCodecImageGenerator::onRefEncodedData() { - return SkRef(fData.get()); -} -#else sk_sp 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 e608d8e717..2bbf118941 100644 --- a/src/codec/SkCodecImageGenerator.h +++ b/src/codec/SkCodecImageGenerator.h @@ -21,11 +21,7 @@ public: static std::unique_ptr MakeFromEncodedCodec(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& opts) override; -- cgit v1.2.3