add SkPixmap and external locking to bitmaps

src/core/SkPixelRef.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapCache.h"
 #include "SkPixelRef.h"
 #include "SkThread.h"
@@ skipping 181 matching lines @@
             if (fRec.fPixels) {
                 this->onUnlockPixels();
                 fRec.zero();
             } else {
                 SkASSERT(fRec.isZero());
             }
         }
     }
 }
 
+bool SkPixelRef::requestLock(const LockRequest& request, LockResult* result) {
+    SkASSERT(result);
+    if (request.fSize.isEmpty()) {
+        return false;
+    }
+
+    if (fPreLocked) {
+        result->fUnlockProc = NULL;
+        result->fUnlockContext = NULL;
+        result->fCTable = fRec.fColorTable;
+        result->fPixels = fRec.fPixels;
+        result->fRowBytes = fRec.fRowBytes;
+        result->fSize.set(fInfo.width(), fInfo.height());
+        return true;
+    } else {
+        SkAutoMutexAcquire  ac(*fMutex);
+        return this->onRequestLock(request, result);
+    }
+}
+
 bool SkPixelRef::lockPixelsAreWritable() const {
     return this->onLockPixelsAreWritable();
 }
 
 bool SkPixelRef::onLockPixelsAreWritable() const {
     return true;
 }
 
 uint32_t SkPixelRef::getGenerationID() const {
     uint32_t id = fTaggedGenID.load();
@@ skipping 52 matching lines @@
 }
 
 void SkPixelRef::setImmutable() {
     fIsImmutable = true;
 }
 
 bool SkPixelRef::readPixels(SkBitmap* dst, const SkIRect* subset) {
     return this->onReadPixels(dst, subset);
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 bool SkPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
     return false;
 }
 
 SkData* SkPixelRef::onRefEncodedData() {
     return NULL;
 }
 
 bool SkPixelRef::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
                                  SkYUVColorSpace* colorSpace) {
     return false;
 }
 
 size_t SkPixelRef::getAllocatedSizeInBytes() const {
     return 0;
 }
 
+static void unlock_legacy_result(void* ctx) {
+    SkPixelRef* pr = (SkPixelRef*)ctx;
+    pr->unlockPixels();
+}
+
+bool SkPixelRef::onRequestLock(const LockRequest& request, LockResult* result) {
+    LockRec rec;
+    if (!this->onNewLockPixels(&rec)) {
+        return false;
+    }
+
+    result->fUnlockProc = unlock_legacy_result;
+    result->fUnlockContext = SkRef(this);
+    result->fCTable = rec.fColorTable;
+    result->fPixels = rec.fPixels;
+    result->fRowBytes = rec.fRowBytes;
+    result->fSize.set(fInfo.width(), fInfo.height());
+    return true;
+}