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

Unified Diff: views/controls/button/image_button.cc

Issue 149313: Fix memory leak in ImageButton exposed by r20028. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 | « views/controls/button/image_button.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/image_button.cc
===================================================================
--- views/controls/button/image_button.cc (revision 20100)
+++ views/controls/button/image_button.cc (working copy)
@@ -38,10 +38,10 @@
SkBitmap* image,
SkBitmap* mask) {
if (!color && !image)
- background_image_ = NULL;
+ background_image_.reset(NULL);
- background_image_ = new SkBitmap(
- skia::ImageOperations::CreateButtonBackground(color, *image, *mask));
+ background_image_.reset(new SkBitmap(
+ skia::ImageOperations::CreateButtonBackground(color, *image, *mask)));
}
void ImageButton::SetImageAlignment(HorizontalAlignment h_align,
@@ -79,8 +79,8 @@
else if (v_alignment_ == ALIGN_BOTTOM)
y = height() - img.height();
- if (background_image_)
- canvas->DrawBitmapInt(*background_image_, x, y);
+ if (background_image_.get())
+ canvas->DrawBitmapInt(*(background_image_.get()), x, y);
canvas->DrawBitmapInt(img, x, y);
}
PaintFocusBorder(canvas);
« no previous file with comments | « views/controls/button/image_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698