diff options
| author |  Matt Sarett <msarett@google.com> | 2017-05-17 10:23:30 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 14:46:45 +0000 |
| commit | 861a90f3e55546e583d4f3b5fb355c317babcec7 (patch) | |
| tree | d60768770df422ee31a87ee25dd4e7809c8499e6 /include | |
| parent | 7d2a74c8efcf84d47546a711c509e355f4cbebd3 (diff) | |
Delete legacy image generator API flag
Bug: skia:6620
Change-Id: I7ecdb5b162d8d468d91d4c8dbe276fabe349dc15
Reviewed-on: https://skia-review.googlesource.com/17215
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImageGenerator.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h index 8b2ca7d13e..4514a2dadf 100644 --- a/include/core/SkImageGenerator.h +++ b/include/core/SkImageGenerator.h @@ -96,11 +96,6 @@ public: */ bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes); -#ifdef SK_SUPPORT_LEGACY_IMGEN_API - bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], - int* ctableCount); -#endif - /** * If decoding to YUV is supported, this returns true. Otherwise, this * returns false and does not modify any of the parameters. @@ -175,27 +170,8 @@ protected: SkImageGenerator(const SkImageInfo& info, uint32_t uniqueId = kNeedNewImageUniqueID); virtual SkData* onRefEncodedData() { return nullptr; } - -#ifdef SK_SUPPORT_LEGACY_IMGEN_API - virtual bool onGetPixels(const SkImageInfo&, void*, size_t, SkPMColor*, int*) { - return false; - } -#endif - -#ifdef SK_SUPPORT_LEGACY_IMGEN_API - virtual bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, - const Options&) { - - return this->onGetPixels(info, pixels, rowBytes, nullptr, nullptr); - } -#else - virtual bool onGetPixels(const SkImageInfo&, void*, size_t, const Options&) { - return false; - } -#endif - + virtual bool onGetPixels(const SkImageInfo&, void*, size_t, const Options&) { return false; } virtual bool onIsValid(GrContext*) const { return true; } - virtual bool onQueryYUV8(SkYUVSizeInfo*, SkYUVColorSpace*) const { return false; } virtual bool onGetYUV8Planes(const SkYUVSizeInfo&, void*[3] /*planes*/) { return false; } |