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

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 34d1b97..e8d6d99 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -999,7 +999,7 @@
 
 static SkBitmap capture_bitmap(SkCanvas* canvas) {
     SkBitmap bm;
-    if (bm.allocPixels(canvas->imageInfo())) {
+    if (bm.tryAllocPixels(canvas->imageInfo())) {
         canvas->readPixels(&bm, 0, 0);
     }
     return bm;

samplecode/SampleFilterFuzz.cpp

diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 8aa48ed..f4157cd 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -153,7 +153,7 @@
     do {
         info = SkImageInfo::Make(kBitmapSize, kBitmapSize, rand_colortype(),
                                  kPremul_SkAlphaType);
-    } while (!valid_for_raster_canvas(info) || !bitmap->allocPixels(info));
+    } while (!valid_for_raster_canvas(info) || !bitmap->tryAllocPixels(info));
 }
 
 static void make_g_bitmap(SkBitmap& bitmap) {

samplecode/SampleUnpremul.cpp

diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index bfe69e0b..992444d 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -128,11 +128,7 @@
             // Copy it to a bitmap which can be drawn, converting
             // to premultiplied:
             SkBitmap bm;
-            if (!bm.allocN32Pixels(fBitmap.width(), fBitmap.height())) {
-                SkString errMsg("allocPixels failed");
-                canvas->drawText(errMsg.c_str(), errMsg.size(), 0, height, paint);
-                return;
-            }
+            bm.allocN32Pixels(fBitmap.width(), fBitmap.height());
             for (int i = 0; i < fBitmap.width(); ++i) {
                 for (int j = 0; j < fBitmap.height(); ++j) {
                     *bm.getAddr32(i, j) = premultiply_unpmcolor(*fBitmap.getAddr32(i, j));