commit b99c4a7bf2ff8d34b6adc053071a8bafdc868c73
author halcanary <halcanary@google.com> Thu Aug 07 11:13:45 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 07 11:13:45 2014 -0700
tree 690bd72de3102732a4e3228e5e56e0addfe29021
parent 45a0bf505914adf0ee8c69e2647230618bbb3a63

Assert allocation so we can catch it sooner.

R=bungeman@google.com, mtklein@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/445363007

src/pdf/SkPDFImage.cpp

diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 7e17f98..715fb48 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -374,11 +374,12 @@
 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++) {
@@ -428,8 +429,6 @@
         default:
             SkASSERT(false);
     }
-    bitmap.unlockPixels();
-    outBitmap.unlockPixels();
 
     outBitmap.setImmutable();