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

include/core/SkPixelRef.h

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPixelRef_DEFINED
 #define SkPixelRef_DEFINED
 
@@ skipping 68 matching lines @@
         SkColorTable*   fColorTable;
         size_t          fRowBytes;
 
         void zero() { sk_bzero(this, sizeof(*this)); }
 
         bool isZero() const {
             return NULL == fPixels && NULL == fColorTable && 0 == fRowBytes;
         }
     };
 
-    SkDEBUGCODE(bool isLocked() const { return fLockCount > 0; })
+    /**
+     *  Returns true if the lockcount > 0
+     */
+    bool isLocked() const { return fLockCount > 0; }
+
     SkDEBUGCODE(int getLockCount() const { return fLockCount; })
 
     /**
      *  Call to access the pixel memory. Return true on success. Balance this
      *  with a call to unlockPixels().
      */
     bool lockPixels();
 
     /**
      *  Call to access the pixel memory. On success, return true and fill out
@@ skipping 86 matching lines @@
      *  return a ref to its data. If the pixelRef
      *  is uncompressed or otherwise does not have this form, return NULL.
      *
      *  If non-null is returned, the caller is responsible for calling unref()
      *  on the data when it is finished.
      */
     SkData* refEncodedData() {
         return this->onRefEncodedData();
     }
 
+    /**
+     *  Experimental -- tells the caller if it is worth it to call decodeInto().
+     *  Just an optimization at this point, to avoid checking the cache first.
+     *  We may remove/change this call in the future.
+     */
+    bool implementsDecodeInto() {
+        return this->onImplementsDecodeInto();
+    }
+
+    /**
+     *  Return a decoded instance of this pixelRef in bitmap. If this cannot be
+     *  done, return false and the bitmap parameter is ignored/unchanged.
+     *
+     *  pow2 is the requeste power-of-two downscale that the caller needs. This
+     *  can be ignored, and the "original" size can be returned, but if the
+     *  underlying codec can efficiently return a smaller size, that should be
+     *  done. Some examples:
+     *
+     *  To request the "base" version (original scale), pass 0 for pow2
+     *  To request 1/2 scale version (1/2 width, 1/2 height), pass 1 for pow2
+     *  To request 1/4 scale version (1/4 width, 1/4 height), pass 2 for pow2
+     *  ...
+     *
+     *  If this returns true, then bitmap must be "locked" such that
+     *  bitmap->getPixels() will return the correct address.
+     */
+    bool decodeInto(int pow2, SkBitmap* bitmap) {
+        SkASSERT(pow2 >= 0);
+        return this->onDecodeInto(pow2, bitmap);
+    }
+
     /** Are we really wrapping a texture instead of a bitmap?
      */
     virtual GrTexture* getTexture() { return NULL; }
 
     /**
      *  If any planes or rowBytes is NULL, this should output the sizes and return true
      *  if it can efficiently return YUV planar data. If it cannot, it should return false.
      *
      *  If all planes and rowBytes are not NULL, then it should copy the associated Y,U,V data
      *  into those planes of memory supplied by the caller. It should validate that the sizes
@@ skipping 55 matching lines @@
      *  move or discard that memory.
      *
      *  The caller will have already acquired a mutex for thread safety, so this
      *  method need not do that.
      */
     virtual void onUnlockPixels() = 0;
 
     /** Default impl returns true */
     virtual bool onLockPixelsAreWritable() const;
 
+    // returns false;
+    virtual bool onImplementsDecodeInto();
+    // returns false;
+    virtual bool onDecodeInto(int pow2, SkBitmap* bitmap);
+
     /**
      *  For pixelrefs that don't have access to their raw pixels, they may be
      *  able to make a copy of them (e.g. if the pixels are on the GPU).
      *
      *  The base class implementation returns false;
      */
     virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subsetOrNull);
 
     // default impl returns NULL.
     virtual SkData* onRefEncodedData();
@@ skipping 65 matching lines @@
     /**
      *  Allocate a new pixelref matching the specified ImageInfo, allocating
      *  the memory for the pixels. If the ImageInfo requires a ColorTable,
      *  the pixelref will ref() the colortable.
      *  On failure return NULL.
      */
     virtual SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) = 0;
 };
 
 #endif