Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(367)

Unified Diff: skia/ext/bitmap_platform_device_mac.cc

Issue 39307: Fix memory leak of "screen size bitmap" (e.g. 1.5M if 750x548) ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/bitmap_platform_device_mac.cc
===================================================================
--- skia/ext/bitmap_platform_device_mac.cc (revision 11173)
+++ skia/ext/bitmap_platform_device_mac.cc (working copy)
@@ -146,12 +146,11 @@
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
@@ -224,7 +223,7 @@
return data_->GetBitmapContext();
}
-void BitmapPlatformDeviceMac::setMatrixClip(const SkMatrix& transform,
+void BitmapPlatformDeviceMac::setMatrixClip(const SkMatrix& transform,
const SkRegion& region) {
data_->SetMatrixClip(transform, region);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698