Index: skia/ext/skia_utils_mac.mm |
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm |
index 6a624a8e69a0f06352dcd58e37d4e6a6cd8a76e7..f67d3c1c02de34ec181e768770ab2db6fab9650c 100644 |
--- a/skia/ext/skia_utils_mac.mm |
+++ b/skia/ext/skia_utils_mac.mm |
@@ -27,13 +27,7 @@ SkBitmap NSImageOrNSImageRepToSkBitmapWithColorSpace( |
DCHECK((image != 0) ^ (image_rep != 0)); |
SkBitmap bitmap; |
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, |
- size.width, |
- size.height, |
- 0, |
- is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); |
- |
- if (!bitmap.allocPixels()) |
+ if (!bitmap.allocN32Pixels(size.width, size.height, is_opaque)) |
return bitmap; // Return |bitmap| which should respond true to isNull(). |
@@ -381,9 +375,8 @@ CGContextRef SkiaBitLocker::cgContext() { |
bitmap_ = deviceBits; |
bitmap_.lockPixels(); |
} else { |
- bitmap_.setConfig( |
- SkBitmap::kARGB_8888_Config, deviceBits.width(), deviceBits.height()); |
- bitmap_.allocPixels(); |
+ if (!bitmap_.allocN32Pixels(deviceBits.width(), deviceBits.height())) |
+ return 0; |
bitmap_.eraseColor(0); |
} |
base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( |