Remove double allocation of pixels when constructing an SkDevice backed by CoreGraphics pixels

BUG=277680

Review URL: https://chromiumcodereview.appspot.com/22872011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219356 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index b7b05e5..c09f8be 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -125,15 +125,17 @@ BitmapPlatformDevice* BitmapPlatformDevice::Create(CGContextRef context,
     return NULL;
 
   SkBitmap bitmap;
+  // TODO: verify that the CG Context's pixels will have tight rowbytes or pass in the correct
+  // rowbytes for the case when context != NULL.
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  if (bitmap.allocPixels() != true)
-    return NULL;
 
-  void* data = NULL;
+  void* data;
   if (context) {
     data = CGBitmapContextGetData(context);
     bitmap.setPixels(data);
   } else {
+    if (!bitmap.allocPixels())
+      return NULL;
     data = bitmap.getPixels();
   }