Fix memory leaks in Mac code.

Found with Mac OS X 'leaks' tool pointing at a Chromium debug build started with MallocStackLogging=1 BUG=none Review URL: https://codereview.chromium.org/719423004 Cr-Commit-Position: refs/heads/master@{#304286}
SaschaDeWaal · Nov 14, 2014 · 9fcd06f · 9fcd06f
1 parent feac786
commit 9fcd06f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -1021,7 +1021,7 @@ - (void)setContentViewSubviews:(NSArray*)subviews {
   }
 
   // Remove all subviews that aren't the tabContentArea.
-  for (NSView* view in [[self.chromeContentView subviews] copy]) {
+  for (NSView* view in [[[self.chromeContentView subviews] copy] autorelease]) {
     if (view != tabContentArea)
       [view removeFromSuperview];
   }

diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -529,8 +529,9 @@ float FlipYFromRectToScreen(float y, float rect_height) {
   // Paint this view host with |background_color_| when there is no content
   // ready to draw.
   background_layer_.reset([[CALayer alloc] init]);
-  [background_layer_
-      setBackgroundColor:gfx::CGColorCreateFromSkColor(background_color_)];
+  base::ScopedCFTypeRef<CGColorRef> background(
+      gfx::CGColorCreateFromSkColor(background_color_));
+  [background_layer_ setBackgroundColor:background];
   [cocoa_view_ setLayer:background_layer_];
   [cocoa_view_ setWantsLayer:YES];