commit 848250415eddc54075f7eb8795e8db79e749c6ab
author reed <reed@google.com> Tue Sep 02 12:50:45 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 02 12:50:45 2014 -0700
tree eb60aea6e61c9b3a9e195ab3cfb01d571351f78b
parent 00f30bdc9e34b013da54b4406f36556c5be8d041

make allocPixels throw on failure

BUG=skia:
R=mtklein@google.com, fmalita@google.com, fmalita@chromium.org

Author: reed@google.com

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

src/image/SkImage.cpp

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 795b842..a606384 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -117,9 +117,8 @@
             return false;
         }
     } else {
-        const SkImageInfo info = SkImageInfo::MakeN32Premul(subset.width(), subset.height());
         SkBitmap tmp;
-        if (!tmp.allocPixels(info)) {
+        if (!tmp.tryAllocN32Pixels(subset.width(), subset.height())) {
             return false;
         }
         *bitmap = tmp;