Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / utils / mac / SkCreateCGImageRef.cpp

diff --git a/src/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp b/src/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp
index 01b774d..14a24d8 100644 (file)
--- a/src/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp
@@ -221,7 +221,7 @@ bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
     int h = (int)CGRectGetHeight(bounds);
 
     SkBitmap bitmap;
-    if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(w, h))) {
+    if (!bitmap.tryAllocN32Pixels(w, h)) {
         return false;
     }
     bitmap.eraseColor(SK_ColorWHITE);
@@ -287,7 +287,7 @@ bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image, SkISize* scaleTo
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
 
     SkBitmap tmp;
-    if (!tmp.allocPixels(info)) {
+    if (!tmp.tryAllocPixels(info)) {
         return false;
     }