Assert allocation so we can catch it sooner.

src/pdf/SkPDFImage.cpp

 /*
  * Copyright 2010 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.
  */
 
 #include "SkPDFImage.h"
 
 #include "SkBitmap.h"
@@ skipping 356 matching lines @@
         return SkPackARGB4444(SK_AlphaOPAQUE & 0x0F, 0, 0, 0);
     } else {
         return SkPackARGB4444(SK_AlphaOPAQUE & 0x0F,
                                    r / count, g / count, b / count);
     }
 }
 
 static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
                                      const SkIRect& srcRect) {
     SkBitmap outBitmap;
-    outBitmap.allocPixels(bitmap.info().makeWH(srcRect.width(), srcRect.height()));
+    SkAssertResult(outBitmap.allocPixels(
+            bitmap.info().makeWH(srcRect.width(), srcRect.height())));
     int dstRow = 0;
 
-    outBitmap.lockPixels();
-    bitmap.lockPixels();
+    SkAutoLockPixels outBitmapPixelLock(outBitmap);
+    SkAutoLockPixels bitmapPixelLock(bitmap);
     switch (bitmap.colorType()) {
         case kARGB_4444_SkColorType: {
             for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
                 uint16_t* dst = outBitmap.getAddr16(0, dstRow);
                 uint16_t* src = bitmap.getAddr16(0, y);
                 for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
                     uint8_t a = SkGetPackedA4444(src[x]);
                     // It is necessary to average the color component of
                     // transparent pixels with their surrounding neighbors
                     // since the PDF renderer may separately re-sample the
@@ skipping 29 matching lines @@
                     }
                     dst++;
                 }
                 dstRow++;
             }
             break;
         }
         default:
             SkASSERT(false);
     }
-    bitmap.unlockPixels();
-    outBitmap.unlockPixels();
 
     outBitmap.setImmutable();
 
     return outBitmap;
 }
 
 // static
 SkPDFImage* SkPDFImage::CreateImage(const SkBitmap& bitmap,
                                     const SkIRect& srcRect,
                                     SkPicture::EncodeBitmap encoder) {
@@ skipping 179 matching lines @@
         // but the new catalog wants it compressed.
         if (!getSubstitute()) {
             SkPDFStream* substitute = SkNEW_ARGS(SkPDFImage, (*this));
             setSubstitute(substitute);
             catalog->setSubstitute(this, substitute);
         }
         return false;
     }
     return true;
 }