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/codec | |
| 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/codec')
| -rw-r--r-- | src/codec/SkCodecImageGenerator.cpp | 6 | ||||
| -rw-r--r-- | src/codec/SkCodecImageGenerator.h | 4 |
2 files changed, 0 insertions, 10 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; |