diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-05-17 11:58:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-17 20:40:03 +0000 |
| commit | e6c0fe0b8fb4fb66b0c8d3b3abac6257c3201f00 (patch) | |
| tree | 147ed60fd2c5467f1a93ec1c26d5932f8cb33910 /src/ports | |
| parent | 2d2fedd25de02aba20f5078e74df92b2d25b799c (diff) | |
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>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkImageGeneratorCG.cpp | 6 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorCG.h | 4 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorWIC.cpp | 6 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorWIC.h | 4 |
4 files changed, 0 insertions, 20 deletions
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; |