diff options
author | scroggo <scroggo@chromium.org> | 2015-07-30 07:47:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-30 07:47:45 -0700 |
commit | ef004e1b49ce6ad488ea4444c0eb896ef37c1242 (patch) | |
tree | cc06764b4fc7d508c2a1a13a0cba8ed334aa010b /src/core/SkImageGenerator.cpp | |
parent | 6cb3cbe8e67db5fb94ba7d98f60833229b008544 (diff) |
Remove SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
Now that Chrome no longer depends on it, remove dead code.
Review URL: https://codereview.chromium.org/1263013002
Diffstat (limited to 'src/core/SkImageGenerator.cpp')
-rw-r--r-- | src/core/SkImageGenerator.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp index 8c9ff6a035..82b42d7a97 100644 --- a/src/core/SkImageGenerator.cpp +++ b/src/core/SkImageGenerator.cpp @@ -31,25 +31,11 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r ctable = NULL; } -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS - // Default options. - Options options; - const Result result = this->onGetPixels(info, pixels, rowBytes, options, ctable, ctableCount); - - if (kIncompleteInput != result && kSuccess != result) { - return false; - } - if (ctableCount) { - SkASSERT(*ctableCount >= 0 && *ctableCount <= 256); - } - return true; -#else const bool success = this->onGetPixels(info, pixels, rowBytes, ctable, ctableCount); if (success && ctableCount) { SkASSERT(*ctableCount >= 0 && *ctableCount <= 256); } return success; -#endif } bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) { @@ -118,18 +104,10 @@ SkData* SkImageGenerator::onRefEncodedData() { return NULL; } -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS -SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst, - size_t rb, const Options& options, - SkPMColor* colors, int* colorCount) { - return kUnimplemented; -} -#else bool SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst, size_t rb, SkPMColor* colors, int* colorCount) { return false; } -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// |