make allocPixels throw on failure

include/core/SkBitmap.h

 /*
  * Copyright 2006 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.
  */
 
 #ifndef SkBitmap_DEFINED
 #define SkBitmap_DEFINED
 
 #include "SkColor.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
+#ifdef SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL
+    #define SK_ALLOCPIXELS_RETURN_TYPE  bool
+    #define SK_ALLOCPIXELS_RETURN(predicate) return (predicate)
+#else
+    #define SK_ALLOCPIXELS_RETURN_TYPE  void
+    #define SK_ALLOCPIXELS_RETURN(arg)      (arg)
+#endif
+
 struct SkMask;
 struct SkIRect;
 struct SkRect;
 class SkPaint;
 class SkPixelRef;
 class SkPixelRefFactory;
 class SkRegion;
 class SkString;
 class GrTexture;
 
@@ skipping 184 matching lines @@
     void getBounds(SkIRect* bounds) const;
 
     bool setInfo(const SkImageInfo&, size_t rowBytes = 0);
 
     /**
      *  Allocate the bitmap's pixels to match the requested image info. If the Factory
      *  is non-null, call it to allcoate the pixelref. If the ImageInfo requires
      *  a colortable, then ColorTable must be non-null, and will be ref'd.
      *  On failure, the bitmap will be set to empty and return false.
      */
-    bool allocPixels(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);
+    bool allocPixelsCheck(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);

[mtklein, 2014/08/29 17:59:49]

tryAllocPixels?  allocPixelsCheck sounds a little too much like CHECK to me,
which made me parse the name with the wrong "alloc pixels or crash" meaning.

+
+    SK_ALLOCPIXELS_RETURN_TYPE allocPixels(const SkImageInfo& info, SkPixelRefFactory* factory,
+                                           SkColorTable* ctable) {
+        if (!this->allocPixelsCheck(info, factory, ctable)) {
+            sk_throw();
+        }
+        SK_ALLOCPIXELS_RETURN(true);
+    }
 
     /**
      *  Allocate the bitmap's pixels to match the requested image info and
      *  rowBytes. If the request cannot be met (e.g. the info is invalid or
      *  the requested rowBytes are not compatible with the info
      *  (e.g. rowBytes < info.minRowBytes() or rowBytes is not aligned with
      *  the pixel size specified by info.colorType()) then false is returned
      *  and the bitmap is set to empty.
      */
-    bool allocPixels(const SkImageInfo& info, size_t rowBytes);
+    bool allocPixelsCheck(const SkImageInfo& info, size_t rowBytes);
+
+    SK_ALLOCPIXELS_RETURN_TYPE allocPixels(const SkImageInfo& info, size_t rowBytes) {
+        if (!this->allocPixelsCheck(info, rowBytes)) {
+            sk_throw();
+        }
+        SK_ALLOCPIXELS_RETURN(true);
+    }
 
     /**
      *  Allocate a pixelref to match the specified image info, using the default
      *  allocator.
      *  On success, the bitmap's pixels will be "locked", and return true.
      *  On failure, the bitmap will be set to empty and return false.

[f(malita), 2014/08/29 18:21:15]

Should also update the docs at some point.

      */
-    bool allocPixels(const SkImageInfo& info) {
-        return this->allocPixels(info, info.minRowBytes());
+    SK_ALLOCPIXELS_RETURN_TYPE allocPixels(const SkImageInfo& info) {
+        SK_ALLOCPIXELS_RETURN(this->allocPixels(info, info.minRowBytes()));
     }
 
-    bool allocN32Pixels(int width, int height, bool isOpaque = false) {
+    SK_ALLOCPIXELS_RETURN_TYPE allocN32Pixels(int width, int height, bool isOpaque = false) {
         SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
         if (isOpaque) {
             info.fAlphaType = kOpaque_SkAlphaType;
         }
-        return this->allocPixels(info);
+        SK_ALLOCPIXELS_RETURN(this->allocPixels(info));
     }
 
     /**
      *  Install a pixelref that wraps the specified pixels and rowBytes, and
      *  optional ReleaseProc and context. When the pixels are no longer
      *  referenced, if releaseProc is not null, it will be called with the
      *  pixels and context as parameters.
      *  On failure, the bitmap will be set to empty and return false.
      */
     bool installPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkColorTable*,
@@ skipping 577 matching lines @@
 
 inline SkPMColor SkBitmap::getIndex8Color(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(kIndex_8_SkColorType == this->colorType());
     SkASSERT((unsigned)x < (unsigned)this->width() && (unsigned)y < (unsigned)this->height());
     SkASSERT(fColorTable);
     return (*fColorTable)[*((const uint8_t*)fPixels + y * fRowBytes + x)];
 }
 
 #endif