diff options
author | Mike Reed <reed@google.com> | 2016-12-08 13:41:10 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-08 19:25:49 +0000 |
commit | df8599ac246515b4e7ea8ed0285e4b416b8bc570 (patch) | |
tree | b4a837719319cf9a2606ccd60207b830cadb8941 /include/core/SkImageGenerator.h | |
parent | fc6d9e95407293fbbabb0388ebbe311403a896bc (diff) |
remove SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX flag
BUG=skia:
Change-Id: I51b7778db8b596b2633b6be9488af984cee2af70
Reviewed-on: https://skia-review.googlesource.com/5713
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include/core/SkImageGenerator.h')
-rw-r--r-- | include/core/SkImageGenerator.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h index e775d9e02c..7bb4669017 100644 --- a/include/core/SkImageGenerator.h +++ b/include/core/SkImageGenerator.h @@ -25,12 +25,6 @@ class SkMatrix; class SkPaint; class SkPicture; -#ifdef SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX - #define SK_REFENCODEDDATA_CTXPARAM -#else - #define SK_REFENCODEDDATA_CTXPARAM GrContext* ctx -#endif - class SK_API SkImageGenerator : public SkNoncopyable { public: /** @@ -51,11 +45,7 @@ public: * unref() on the data when it is finished. */ SkData* refEncodedData(GrContext* ctx = nullptr) { -#ifdef SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX - return this->onRefEncodedData(); -#else return this->onRefEncodedData(ctx); -#endif } /** @@ -257,7 +247,7 @@ protected: SkImageGenerator(const SkImageInfo& info, uint32_t uniqueId = kNeedNewImageUniqueID); - virtual SkData* onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM); + virtual SkData* onRefEncodedData(GrContext* ctx); virtual bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount); |