diff options
author | mtklein <mtklein@chromium.org> | 2015-02-20 12:40:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 12:40:40 -0800 |
commit | 96d68b704626fe3543ea14a48b4f909519644b54 (patch) | |
tree | aef310089392744647874209a680a683a0dd3ea9 /src/lazy | |
parent | 7ff705023df8f56cfdc3d3df215e96f7ac5caee7 (diff) |
Make SkPixelRef::isLocked() debug-only, remove related dead code.
DM's okay locally with no diffs, no failures.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/8e65712486c66108677a9b0a55ad3e7ca94db555
Review URL: https://codereview.chromium.org/940083002
Diffstat (limited to 'src/lazy')
-rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 11 | ||||
-rw-r--r-- | src/lazy/SkDiscardablePixelRef.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index 50988587a7..b6dec1b3a1 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -18,6 +18,7 @@ SkDiscardablePixelRef::SkDiscardablePixelRef(const SkImageInfo& info, , fDMFactory(fact) , fRowBytes(rowBytes) , fDiscardableMemory(NULL) + , fDiscardableMemoryIsLocked(false) { SkASSERT(fGenerator != NULL); SkASSERT(fRowBytes > 0); @@ -28,8 +29,9 @@ SkDiscardablePixelRef::SkDiscardablePixelRef(const SkImageInfo& info, } SkDiscardablePixelRef::~SkDiscardablePixelRef() { - if (this->isLocked()) { + if (fDiscardableMemoryIsLocked) { fDiscardableMemory->unlock(); + fDiscardableMemoryIsLocked = false; } SkDELETE(fDiscardableMemory); SkSafeUnref(fDMFactory); @@ -39,6 +41,7 @@ SkDiscardablePixelRef::~SkDiscardablePixelRef() { bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { if (fDiscardableMemory != NULL) { if (fDiscardableMemory->lock()) { + fDiscardableMemoryIsLocked = true; rec->fPixels = fDiscardableMemory->data(); rec->fColorTable = fCTable.get(); rec->fRowBytes = fRowBytes; @@ -46,16 +49,20 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { } SkDELETE(fDiscardableMemory); fDiscardableMemory = NULL; + fDiscardableMemoryIsLocked = false; } const size_t size = this->info().getSafeSize(fRowBytes); if (fDMFactory != NULL) { fDiscardableMemory = fDMFactory->create(size); + fDiscardableMemoryIsLocked = true; } else { fDiscardableMemory = SkDiscardableMemory::Create(size); + fDiscardableMemoryIsLocked = true; } if (NULL == fDiscardableMemory) { + fDiscardableMemoryIsLocked = false; return false; // Memory allocation failed. } @@ -72,6 +79,7 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { break; default: fDiscardableMemory->unlock(); + fDiscardableMemoryIsLocked = false; SkDELETE(fDiscardableMemory); fDiscardableMemory = NULL; return false; @@ -96,6 +104,7 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { void SkDiscardablePixelRef::onUnlockPixels() { fDiscardableMemory->unlock(); + fDiscardableMemoryIsLocked = false; } bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index 448f0ab24b..38ff2c4703 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -41,6 +41,7 @@ private: // PixelRef, since the SkBitmap doesn't expect them to change. SkDiscardableMemory* fDiscardableMemory; + bool fDiscardableMemoryIsLocked; SkAutoTUnref<SkColorTable> fCTable; /* Takes ownership of SkImageGenerator. */ |