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/ports/SkImageGenerator_skia.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/ports/SkImageGenerator_skia.cpp')
| -rw-r--r-- | src/ports/SkImageGenerator_skia.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/ports/SkImageGenerator_skia.cpp b/src/ports/SkImageGenerator_skia.cpp index 1dbc9a5f33..72480b8f68 100644 --- a/src/ports/SkImageGenerator_skia.cpp +++ b/src/ports/SkImageGenerator_skia.cpp @@ -46,14 +46,8 @@ protected: SkData* onRefEncodedData() override { return SkRef(fData.get()); } -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS - Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, - const Options&, - SkPMColor ctableEntries[], int* ctableCount) override { -#else bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctableEntries[], int* ctableCount) override { -#endif SkMemoryStream stream(fData->data(), fData->size(), false); SkAutoTUnref<BareMemoryAllocator> allocator(SkNEW_ARGS(BareMemoryAllocator, (info, pixels, rowBytes))); @@ -64,11 +58,7 @@ protected: const SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, info.colorType(), SkImageDecoder::kDecodePixels_Mode); if (SkImageDecoder::kFailure == result) { -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS - return kInvalidInput; -#else return false; -#endif } SkASSERT(info.colorType() == bm.info().colorType()); @@ -78,24 +68,13 @@ protected: SkColorTable* ctable = bm.getColorTable(); if (NULL == ctable) { -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS - return kInvalidConversion; -#else return false; -#endif } const int count = ctable->count(); memcpy(ctableEntries, ctable->readColors(), count * sizeof(SkPMColor)); *ctableCount = count; } -#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS - if (SkImageDecoder::kPartialSuccess == result) { - return kIncompleteInput; - } - return kSuccess; -#else return true; -#endif } bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3], |