diff options
author | 2014-02-10 15:43:29 +0000 | |
---|---|---|
committer | 2014-02-10 15:43:29 +0000 | |
commit | 6be31f42cac550dfa6fd936b36484002b6eadc9c (patch) | |
tree | 7904ad7070188c873786be38e1149a84141c057c /src | |
parent | 57641651275c139e34be3f1cd963ff35b8362051 (diff) |
remove SK_SUPPORT_LEGACY_ONLOCKPIXELS completely
BUG=skia:
Review URL: https://codereview.chromium.org/158893005
git-svn-id: http://skia.googlecode.com/svn/trunk@13382 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmap.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPixelRef.cpp | 23 |
2 files changed, 0 insertions, 27 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index c2be7c7cfc..6a70c1e089 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1677,16 +1677,12 @@ void SkBitmap::validate() const { SkASSERT(fPixelRef); SkASSERT(fPixelLockCount > 0); SkASSERT(fPixelRef->isLocked()); -#if !defined(SK_SUPPORT_LEGACY_ONLOCKPIXELS) SkASSERT(fPixelRef->rowBytes() == fRowBytes); -#endif SkASSERT(fPixelRefOrigin.fX >= 0); SkASSERT(fPixelRefOrigin.fY >= 0); SkASSERT(fPixelRef->info().fWidth >= (int)fWidth + fPixelRefOrigin.fX); SkASSERT(fPixelRef->info().fHeight >= (int)fHeight + fPixelRefOrigin.fY); -#if !defined(SK_SUPPORT_LEGACY_ONLOCKPIXELS) SkASSERT(fPixelRef->rowBytes() >= fWidth * fBytesPerPixel); -#endif } else { SkASSERT(NULL == fColorTable); } diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index 30b405f7e9..6a26ca0e01 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -291,29 +291,6 @@ size_t SkPixelRef::getAllocatedSizeInBytes() const { /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_SUPPORT_LEGACY_ONLOCKPIXELS - -void* SkPixelRef::onLockPixels(SkColorTable** ctable) { - return NULL; -} - -bool SkPixelRef::onNewLockPixels(LockRec* rec) { - SkColorTable* ctable = NULL; // for legacy clients who forget to set this - void* pixels = this->onLockPixels(&ctable); - if (!pixels) { - return false; - } - - rec->fPixels = pixels; - rec->fColorTable = ctable; - rec->fRowBytes = 0; // callers don't currently need this (thank goodness) - return true; -} - -#endif - -/////////////////////////////////////////////////////////////////////////////// - #ifdef SK_BUILD_FOR_ANDROID void SkPixelRef::globalRef(void* data) { this->ref(); |