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

src/core/SkBitmapProcState.cpp

Index: src/core/SkBitmapProcState.cpp
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 30a64ed5a84e7f3b3bef80b5e429cc5d1d83457c..64a8d3b1e1de20753eb50a20c4d9a6707aa9924a 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -243,43 +243,12 @@ void SkBitmapProcState::processMediumRequest() {
     }
 }
 
-static bool get_locked_pixels(const SkBitmap& src, int pow2, SkBitmap* dst) {
-    SkPixelRef* pr = src.pixelRef();
-    if (pr && pr->decodeInto(pow2, dst)) {
-        return true;
-    }
-
-    /*
-     *  If decodeInto() fails, it is possibe that we have an old subclass that
-     *  does not, or cannot, implement that. In that case we fall back to the
-     *  older protocol of having the pixelRef handle the caching for us.
-     */
-    *dst = src;
-    dst->lockPixels();
-    return SkToBool(dst->getPixels());
-}
-
 bool SkBitmapProcState::lockBaseBitmap() {
-    SkPixelRef* pr = fOrigBitmap.pixelRef();
-
-    if (pr->isLocked() || !pr->implementsDecodeInto()) {
-        // fast-case, no need to look in our cache
-        fScaledBitmap = fOrigBitmap;
-        fScaledBitmap.lockPixels();
-        if (NULL == fScaledBitmap.getPixels()) {
-            return false;
-        }
-    } else {
-        if (!SkBitmapCache::Find(fOrigBitmap, 1, 1, &fScaledBitmap)) {
-            if (!get_locked_pixels(fOrigBitmap, 0, &fScaledBitmap)) {
-                return false;
-            }
-
-            // TODO: if fScaled comes back at a different width/height than fOrig,
-            // we need to update the matrix we are using to sample from this guy.
-
-            SkBitmapCache::Add(fOrigBitmap, 1, 1, fScaledBitmap);
-        }
+    // TODO(reed): use bitmap cache here?
+    fScaledBitmap = fOrigBitmap;
+    fScaledBitmap.lockPixels();
+    if (NULL == fScaledBitmap.getPixels()) {
+        return false;
     }
     fBitmap = &fScaledBitmap;
     return true;
@@ -389,7 +358,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
     fShaderProc16 = NULL;
     fSampleProc32 = NULL;
     fSampleProc16 = NULL;
-    
+
     // recompute the triviality of the matrix here because we may have
     // changed it!
 
@@ -563,10 +532,10 @@ bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp,
             fShaderProc32 = this->chooseShaderProc32();
         }
     }
-    
+
     // see if our platform has any accelerated overrides
     this->platformProcs();
-    
+
     return true;
 }