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/image | |
| 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/image')
| -rw-r--r-- | src/image/SkImage_Base.h | 4 | ||||
| -rw-r--r-- | src/image/SkImage_Lazy.cpp | 11 |
2 files changed, 0 insertions, 15 deletions
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 { |