mac: Fix a few memory leaks.

All found by clang's static analyzer. BUG=none Review URL: https://codereview.chromium.org/12390058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185895 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Mar 4, 2013 · d409e1d · d409e1d
1 parent 166dfbb
commit d409e1d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/chrome/browser/ui/cocoa/applescript/element_applescript.mm b/chrome/browser/ui/cocoa/applescript/element_applescript.mm
@@ -14,13 +14,12 @@ @implementation ElementAppleScript
 // record referring to itself.  You must call setContainer:property: before
 // you can call this method.
 - (NSScriptObjectSpecifier*)objectSpecifier {
-  return [[NSUniqueIDSpecifier allocWithZone:[self zone]]
-                  initWithContainerClassDescription:
-      (NSScriptClassDescription*)[[self container] classDescription]
-                                 containerSpecifier:
-                                    [[self container] objectSpecifier]
-                                                key:[self containerProperty]
-                                           uniqueID:[self uniqueID]];
+  return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
+      initWithContainerClassDescription:
+          (NSScriptClassDescription*)[[self container] classDescription]
+                     containerSpecifier:[[self container] objectSpecifier]
+                                    key:[self containerProperty]
+                               uniqueID:[self uniqueID]] autorelease];
 }
 
 - (void)setContainer:(id)value property:(NSString*)property {

diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm
@@ -327,15 +327,15 @@ - (void)performLayout {
   NSView* contentView = [[self window] contentView];
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  textField_ =
-      [[PasswordGenerationTextField alloc]
-         initWithFrame:NSMakeRect(kBorderSize,
-                                  kBorderSize,
-                                  kTextFieldWidth,
-                                  kTextFieldHeight + kTextFieldTopPadding)
-        withController:self
-           normalImage:rb.GetNativeImageNamed(IDR_RELOAD_DIMMED).ToNSImage()
-            hoverImage:rb.GetNativeImageNamed(IDR_RELOAD).ToNSImage()];
+  textField_ = [[[PasswordGenerationTextField alloc]
+      initWithFrame:NSMakeRect(kBorderSize,
+                               kBorderSize,
+                               kTextFieldWidth,
+                               kTextFieldHeight + kTextFieldTopPadding)
+     withController:self
+        normalImage:rb.GetNativeImageNamed(IDR_RELOAD_DIMMED).ToNSImage()
+         hoverImage:rb.GetNativeImageNamed(IDR_RELOAD)
+             .ToNSImage()] autorelease];
   gfx::Font smallBoldFont =
       rb.GetFont(ResourceBundle::SmallFont).DeriveFont(0, gfx::Font::BOLD);
   [textField_ setFont:smallBoldFont.GetNativeFont()];
@@ -360,12 +360,12 @@ - (void)performLayout {
   [button setAction:@selector(fillPassword:)];
   [contentView addSubview:button];
 
-  NSTextField* title = [[NSTextField alloc]
+  scoped_nsobject<NSTextField> title([[NSTextField alloc]
                          initWithFrame:NSMakeRect(
                              kBorderSize,
                              kBorderSize + kTextFieldHeight + kVerticalSpacing,
                              kTitleWidth,
-                             kTitleHeight)];
+                             kTitleHeight)]);
   [title setEditable:NO];
   [title setBordered:NO];
   [title setStringValue:l10n_util::GetNSString(

diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
@@ -363,8 +363,10 @@ SkBitmap NSImageRepToSkBitmap(
     bitmap_.allocPixels();
     bitmap_.eraseColor(0);
   }
+  base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
+      CGColorSpaceCreateDeviceRGB());
   cgContext_ = CGBitmapContextCreate(bitmap_.getPixels(), bitmap_.width(),
-    bitmap_.height(), 8, bitmap_.rowBytes(), CGColorSpaceCreateDeviceRGB(), 
+    bitmap_.height(), 8, bitmap_.rowBytes(), colorSpace, 
     kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
 
   // Apply device matrix.

diff --git a/ui/gfx/color_profile_mac.cc b/ui/gfx/color_profile_mac.cc
@@ -10,7 +10,8 @@ namespace gfx {
 
 void ReadColorProfile(std::vector<char>* profile) {
   CGColorSpaceRef monitor_color_space(base::mac::GetSystemColorSpace());
-  CFDataRef icc_profile(CGColorSpaceCopyICCProfile(monitor_color_space));
+  base::mac::ScopedCFTypeRef<CFDataRef> icc_profile(
+      CGColorSpaceCopyICCProfile(monitor_color_space));
   if (icc_profile) {
     size_t length = CFDataGetLength(icc_profile);
     if (length > gfx::kMaxProfileLength)