Revert "Revert "Revert of https://codereview.chromium.org/110593003/""

src/images/SkImageRef_ashmem.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 "SkImageRef_ashmem.h"
 #include "SkImageDecoder.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 141 matching lines @@
     } else {
         if (fRec.fPinned) {
             ashmem_unpin_region(fRec.fFD, 0, 0);
             fRec.fPinned = false;
         }
         this->closeFD();
         return false;
     }
 }
 
-bool SkImageRef_ashmem::onNewLockPixels(LockRec* rec) {
+void* SkImageRef_ashmem::onLockPixels(SkColorTable** ct) {
     SkASSERT(fBitmap.getPixels() == NULL);
     SkASSERT(fBitmap.getColorTable() == NULL);
 
     // fast case: check if we can just pin and get the cached data
     if (-1 != fRec.fFD) {
         SkASSERT(fRec.fAddr);
         SkASSERT(!fRec.fPinned);
         int pin = ashmem_pin_region(fRec.fFD, 0, 0);
 
         if (ASHMEM_NOT_PURGED == pin) { // yea, fast case!
             fBitmap.setPixels(fRec.fAddr, fCT);
             fRec.fPinned = true;
         } else if (ASHMEM_WAS_PURGED == pin) {
             ashmem_unpin_region(fRec.fFD, 0, 0);
             // let go of our colortable if we lost the pixels. Well get it back
             // again when we re-decode
             if (fCT) {
                 fCT->unref();
                 fCT = NULL;
             }
 #if defined(DUMP_ASHMEM_LIFECYCLE) || defined(TRACE_ASH_PURGE)
             SkDebugf("===== ashmem purged %d\n", fBitmap.getSize());
 #endif
         } else {
             SkDebugf("===== ashmem pin_region(%d) returned %d\n", fRec.fFD, pin);
-            return false;
+            // return null result for failure
+            if (ct) {
+                *ct = NULL;
+            }
+            return NULL;
         }
     } else {
         // no FD, will create an ashmem region in allocator
     }
 
-    return this->INHERITED::onNewLockPixels(rec);
+    return this->INHERITED::onLockPixels(ct);
 }
 
 void SkImageRef_ashmem::onUnlockPixels() {
     this->INHERITED::onUnlockPixels();
 
     if (-1 != fRec.fFD) {
         SkASSERT(fRec.fAddr);
         SkASSERT(fRec.fPinned);
 
         ashmem_unpin_region(fRec.fFD, 0, 0);
@@ skipping 15 matching lines @@
     fRec.fFD = -1;
     fRec.fAddr = NULL;
     fRec.fSize = 0;
     fRec.fPinned = false;
     fCT = NULL;
 
     SkString uri;
     buffer.readString(&uri);
     this->setURI(uri);
 }