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 <scroggo@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

8 files changed, 0 insertions, 45 deletions

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<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 e608d8e717..2bbf118941 100644
--- a/src/codec/SkCodecImageGenerator.h
+++ b/src/codec/SkCodecImageGenerator.h
@@ -21,11 +21,7 @@ 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;
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index ba89585cf4..47df69928e 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -76,11 +76,7 @@ public:
 
     virtual sk_sp<SkImage> onMakeSubset(const SkIRect&) const = 0;
 
-#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE
-    virtual SkData* onRefEncoded() const { return nullptr; }
-#else
     virtual sk_sp<SkData> onRefEncoded() const { return nullptr; }
-#endif
 
     virtual bool onAsLegacyBitmap(SkBitmap*) const;
 
diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp
index c627f2224e..82d573d708 100644
--- a/src/image/SkImage_Lazy.cpp
+++ b/src/image/SkImage_Lazy.cpp
@@ -85,11 +85,7 @@ public:
                                             sk_sp<SkColorSpace>*,
                                             SkScalar scaleAdjust[2]) const override;
 #endif
-#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE
-    SkData* onRefEncoded() const override;
-#else
     sk_sp<SkData> onRefEncoded() const override;
-#endif
     sk_sp<SkImage> onMakeSubset(const SkIRect&) const override;
     bool getROPixels(SkBitmap*, SkColorSpace* dstColorSpace, CachingHint) const override;
     bool onIsLazyGenerated() const override { return true; }
@@ -572,17 +568,10 @@ bool SkImage_Lazy::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, siz
     return false;
 }
 
-#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE
-SkData* SkImage_Lazy::onRefEncoded() const {
-    ScopedGenerator generator(fSharedGenerator);
-    return generator->refEncodedData();
-}
-#else
 sk_sp<SkData> SkImage_Lazy::onRefEncoded() const {
     ScopedGenerator generator(fSharedGenerator);
     return generator->refEncodedData();
 }
-#endif
 
 bool SkImage_Lazy::getROPixels(SkBitmap* bitmap, SkColorSpace* dstColorSpace,
                                CachingHint chint) const {
diff --git a/src/ports/SkImageGeneratorCG.cpp b/src/ports/SkImageGeneratorCG.cpp
index c3d2f77cfe..743b218254 100644
--- a/src/ports/SkImageGeneratorCG.cpp
+++ b/src/ports/SkImageGeneratorCG.cpp
@@ -97,15 +97,9 @@ 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<SkData> 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 4f5a3a98b3..ee91c845fc 100644
--- a/src/ports/SkImageGeneratorCG.h
+++ b/src/ports/SkImageGeneratorCG.h
@@ -27,11 +27,7 @@ public:
     static std::unique_ptr<SkImageGenerator> MakeFromEncodedCG(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&)
     override;
diff --git a/src/ports/SkImageGeneratorWIC.cpp b/src/ports/SkImageGeneratorWIC.cpp
index 19d4080960..9aa89733d8 100644
--- a/src/ports/SkImageGeneratorWIC.cpp
+++ b/src/ports/SkImageGeneratorWIC.cpp
@@ -132,15 +132,9 @@ SkImageGeneratorWIC::SkImageGeneratorWIC(const SkImageInfo& info,
     , fData(SkRef(data))
 {}
 
-#if SK_IGNORE_SKIMAGE_ONREFENCODED_CHANGE
-SkData* SkImageGeneratorWIC::onRefEncodedData() {
-    return SkRef(fData.get());
-}
-#else
 sk_sp<SkData> 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 c0ace676f4..5da68f2ea7 100644
--- a/src/ports/SkImageGeneratorWIC.h
+++ b/src/ports/SkImageGeneratorWIC.h
@@ -39,11 +39,7 @@ public:
     static SkImageGenerator* NewFromEncodedWIC(SkData* data);
 
 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&)
     override;