diff options
| author |  reed <reed@chromium.org> | 2014-09-30 10:15:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-30 10:15:32 -0700 |
| commit | 7874dc8e717036f97f14f87daa9431d6f611e467 (patch) | |
| tree | c94c915a4004ab4feef8d2abe3929c519fbdf0c1 /src | |
| parent | fffa16cc277c286687b0f42a7cc87217dd94938e (diff) | |
remove obsolete code for SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
BUG=skia:
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/613933002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkImageGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp index c062978f0f..0f63db50f6 100644 --- a/src/core/SkImageGenerator.cpp +++ b/src/core/SkImageGenerator.cpp @@ -7,7 +7,6 @@ #include "SkImageGenerator.h" -#ifndef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI bool SkImageGenerator::getInfo(SkImageInfo* info) { SkImageInfo dummy; if (NULL == info) { @@ -55,7 +54,6 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r } return this->getPixels(info, pixels, rowBytes, NULL, NULL); } -#endif bool SkImageGenerator::getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3], SkYUVColorSpace* colorSpace) { diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index ec8d5ea9af..c4e3654d1a 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -64,11 +64,7 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { SkPMColor colors[256]; int colorCount = 0; -#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI - if (!fGenerator->getPixels(info, pixels, fRowBytes)) { -#else if (!fGenerator->getPixels(info, pixels, fRowBytes, colors, &colorCount)) { -#endif fDiscardableMemory->unlock(); SkDELETE(fDiscardableMemory); fDiscardableMemory = NULL; |