Revert of Make SkPixelRef::isLocked() debug-only, remove related dead code.

src/lazy/SkDiscardablePixelRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDiscardablePixelRef.h"
 #include "SkDiscardableMemory.h"
 #include "SkImageGenerator.h"
 
 SkDiscardablePixelRef::SkDiscardablePixelRef(const SkImageInfo& info,
                                              SkImageGenerator* generator,
                                              size_t rowBytes,
                                              SkDiscardableMemory::Factory* fact)
     : INHERITED(info)
     , fGenerator(generator)
     , fDMFactory(fact)
     , fRowBytes(rowBytes)
     , fDiscardableMemory(NULL)
-    , fDiscardableMemoryIsLocked(false)
 {
     SkASSERT(fGenerator != NULL);
     SkASSERT(fRowBytes > 0);
     // The SkImageGenerator contract requires fGenerator to always
     // decode the same image on each call to getPixels().
     this->setImmutable();
     SkSafeRef(fDMFactory);
 }
 
 SkDiscardablePixelRef::~SkDiscardablePixelRef() {
-    if (fDiscardableMemoryIsLocked) {
+    if (this->isLocked()) {
         fDiscardableMemory->unlock();
-        fDiscardableMemoryIsLocked = false;
     }
     SkDELETE(fDiscardableMemory);
     SkSafeUnref(fDMFactory);
     SkDELETE(fGenerator);
 }
 
 bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
     if (fDiscardableMemory != NULL) {
         if (fDiscardableMemory->lock()) {
-            fDiscardableMemoryIsLocked = true;
             rec->fPixels = fDiscardableMemory->data();
             rec->fColorTable = fCTable.get();
             rec->fRowBytes = fRowBytes;
             return true;
         }
         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.
     }
 
     void* pixels = fDiscardableMemory->data();
     const SkImageInfo& info = this->info();
     SkPMColor colors[256];
     int colorCount = 0;
 
     const SkImageGenerator::Result result = fGenerator->getPixels(info, pixels, fRowBytes,
                                                                   colors, &colorCount);
     switch (result) {
         case SkImageGenerator::kSuccess:
         case SkImageGenerator::kIncompleteInput:
             break;
         default:
             fDiscardableMemory->unlock();
-            fDiscardableMemoryIsLocked = false;
             SkDELETE(fDiscardableMemory);
             fDiscardableMemory = NULL;
             return false;
     }
 
     // Note: our ctable is not purgeable, as it is not stored in the discardablememory block.
     // This is because SkColorTable is refcntable, and therefore our caller could hold onto it
     // beyond the scope of a lock/unlock. If we change the API/lifecycle for SkColorTable, we
     // could move it into the block, but then again perhaps it is small enough that this doesn't
     // really matter.
     if (colorCount > 0) {
         fCTable.reset(SkNEW_ARGS(SkColorTable, (colors, colorCount)));
     } else {
         fCTable.reset(NULL);
     }
 
     rec->fPixels = pixels;
     rec->fColorTable = fCTable.get();
     rec->fRowBytes = fRowBytes;
     return true;
 }
 
 void SkDiscardablePixelRef::onUnlockPixels() {
     fDiscardableMemory->unlock();
-    fDiscardableMemoryIsLocked = false;
 }
 
 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst,
                                   SkDiscardableMemory::Factory* factory) {
     SkImageInfo info;
     SkAutoTDelete<SkImageGenerator> autoGenerator(generator);
     if ((NULL == autoGenerator.get())
         || (!autoGenerator->getInfo(&info))
         || info.isEmpty()
         || (!dst->setInfo(info))) {
@@ skipping 16 matching lines @@
 // These are the public API
 
 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) {
     return SkInstallDiscardablePixelRef(generator, dst, NULL);
 }
 
 bool SkInstallDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
     SkImageGenerator* generator = SkImageGenerator::NewFromData(encoded);
     return generator ? SkInstallDiscardablePixelRef(generator, dst, NULL) : false;
 }