Revert of tryAllocPixels returns bool, allocPixels requires success

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 namespace {
 
 // Draws an NSImage or an NSImageRep with a given size into a SkBitmap.
 SkBitmap NSImageOrNSImageRepToSkBitmapWithColorSpace(
     NSImage* image,
     NSImageRep* image_rep,
     NSSize size,
     bool is_opaque,
     CGColorSpaceRef color_space) {
   // Only image or image_rep should be provided, not both.
   DCHECK((image != 0) ^ (image_rep != 0));
 
   SkBitmap bitmap;
-  if (!bitmap.tryAllocN32Pixels(size.width, size.height, is_opaque))
+  if (!bitmap.allocN32Pixels(size.width, size.height, is_opaque))
     return bitmap;  // Return |bitmap| which should respond true to isNull().
 
 
   void* data = bitmap.getPixels();
 
   // Allocate a bitmap context with 4 components per pixel (BGRA). Apple
   // recommends these flags for improved CG performance.
 #define HAS_ARGB_SHIFTS(a, r, g, b) \
             (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
              && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
@@ skipping 382 matching lines @@
   useDeviceBits_ = deviceBits.getPixels() &&
                    canvas_->isClipRect() &&
                    !bitmapIsDummy_;
   if (useDeviceBits_) {
     bool result = deviceBits.extractSubset(&bitmap_, clip_bounds);
     DCHECK(result);
     if (!result)
       return 0;
     bitmap_.lockPixels();
   } else {
-    bool result = bitmap_.tryAllocN32Pixels(
+    bool result = bitmap_.allocN32Pixels(
         clip_bounds.width(), clip_bounds.height());
     DCHECK(result);
     if (!result)
       return 0;
     bitmap_.eraseColor(0);
   }
   base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
       CGColorSpaceCreateDeviceRGB());
   cgContext_ = CGBitmapContextCreate(bitmap_.getPixels(), bitmap_.width(),
     bitmap_.height(), 8, bitmap_.rowBytes(), colorSpace, 
     kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
   DCHECK(cgContext_);
 
   SkMatrix matrix = canvas_->getTotalMatrix();
   matrix.postTranslate(-SkIntToScalar(bitmapOffset_.x()),
                        -SkIntToScalar(bitmapOffset_.y()));
   matrix.postScale(1, -1);
   matrix.postTranslate(0, SkIntToScalar(bitmap_.height()));
 
   CGContextConcatCTM(cgContext_, SkMatrixToCGAffineTransform(matrix));
   
   return cgContext_;
 }
 
 bool SkiaBitLocker::hasEmptyClipRegion() const {
   return canvas_->isClipEmpty();
 }
 
 }  // namespace gfx