Fix memory leak of "screen size bitmap" (e.g. 1.5M if 750x548) ...

skia/ext/bitmap_platform_device_mac.cc

 // Copyright (c) 2006-2008 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/bitmap_platform_device_mac.h"
 
 #include <time.h>
 
 #include "SkMatrix.h"
 #include "SkRegion.h"
@@ skipping 128 matching lines @@
 
 
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
 // data.
 BitmapPlatformDeviceMac* BitmapPlatformDeviceMac::Create(CGContextRef context,
                                                          int width,
                                                          int height,
                                                          bool is_opaque) {
-  void* data = malloc(height * width * 4);
-  if (!data) return NULL;
-
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  bitmap.setPixels(data);
+  if (bitmap.allocPixels() != true)
+    return NULL;
+  void* data = bitmap.getPixels();
 
   // Note: The Windows implementation clears the Bitmap later on.
   // This bears mentioning since removal of this line makes the
   // unit tests only fail periodically (or when MallocPreScribble is set).
   bitmap.eraseARGB(0, 0, 0, 0);
 
   bitmap.setIsOpaque(is_opaque);
 
   if (is_opaque) {
 #ifndef NDEBUG
@@ skipping 52 matching lines @@
     const BitmapPlatformDeviceMac& other) {
   data_ = other.data_;
   data_->ref();
   return *this;
 }
 
 CGContextRef BitmapPlatformDeviceMac::GetBitmapContext() {
   return data_->GetBitmapContext();
 }
 
-void BitmapPlatformDeviceMac::setMatrixClip(const SkMatrix& transform, 
+void BitmapPlatformDeviceMac::setMatrixClip(const SkMatrix& transform,
                                             const SkRegion& region) {
   data_->SetMatrixClip(transform, region);
 }
 
 void BitmapPlatformDeviceMac::DrawToContext(CGContextRef context, int x, int y,
                                             const CGRect* src_rect) {
   bool created_dc = false;
   if (!data_->bitmap_context_) {
     created_dc = true;
     GetBitmapContext();
@@ skipping 52 matching lines @@
       size_t offset = (i + bitmap_start_y) * row_words + bitmap_start_x;
       for (int j = 0; j < width; j++) {
         adjustor(data + offset + j);
       }
     }
   }
 }
 
 }  // namespace skia