Fix memory leaks in RenderTextMac.

ui/gfx/render_text_mac.cc

Index: ui/gfx/render_text_mac.cc
===================================================================
--- ui/gfx/render_text_mac.cc	(revision 147870)
+++ ui/gfx/render_text_mac.cc	(working copy)
@@ -155,6 +155,7 @@
 
 void RenderTextMac::ResetLayout() {
   line_.reset();
+  attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
@@ -172,7 +173,8 @@
   const void* keys[] = { kCTFontAttributeName };
   const void* values[] = { ct_font };
   base::mac::ScopedCFTypeRef<CFDictionaryRef> attributes(
-      CFDictionaryCreate(NULL, keys, values, arraysize(keys), NULL, NULL));
+      CFDictionaryCreate(NULL, keys, values, arraysize(keys), NULL,
+                         &kCFTypeDictionaryValueCallBacks));
 
   base::mac::ScopedCFTypeRef<CFStringRef> cf_text(
       base::SysUTF16ToCFStringRef(text()));
@@ -181,6 +183,7 @@
   base::mac::ScopedCFTypeRef<CFMutableAttributedStringRef> attr_text_mutable(
       CFAttributedStringCreateMutableCopy(NULL, 0, attr_text));
 
+  attributes_.reset(CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks));

[Nico, 2012/07/23 19:23:32]

nit: If you did this in ApplyStyles(), you could pass in a good guess for the
capacity

[Alexei Svitkine (slow), 2012/07/23 19:35:55]

Good call, done!

   ApplyStyles(attr_text_mutable, ct_font);
   line_.reset(CTLineCreateWithAttributedString(attr_text_mutable));
 
@@ -235,23 +238,24 @@
                                       style.range.length());
 
     // Note: CFAttributedStringSetAttribute() does not appear to retain the
-    // values passed in, as can be verified via CFGetRetainCount().
-    //
-    // TODO(asvitkine): The attributed string appears to hold weak refs to these
-    // objects (it does not release them either), so we need to keep track of
-    // them ourselves and release them at an appropriate time.
+    // values passed in, as can be verified via CFGetRetainCount(). To ensure
+    // the attribute objects do not leak, they are saved to |attributes_|.
 
-    CGColorRef foreground = gfx::SkColorToCGColorRef(style.foreground);
+    base::mac::ScopedCFTypeRef<CGColorRef> foreground(
+        gfx::CGColorCreateFromSkColor(style.foreground));
     CFAttributedStringSetAttribute(attr_string, range,
                                    kCTForegroundColorAttributeName,
                                    foreground);
+    CFArrayAppendValue(attributes_, foreground);
 
     if (style.underline) {
       CTUnderlineStyle value = kCTUnderlineStyleSingle;
-      CFNumberRef underline = CFNumberCreate(NULL, kCFNumberSInt32Type, &value);
+      base::mac::ScopedCFTypeRef<CFNumberRef> underline(
+          CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
       CFAttributedStringSetAttribute(attr_string, range,
                                      kCTUnderlineStyleAttributeName,
                                      underline);
+      CFArrayAppendValue(attributes_, underline);
     }
 
     if (style.font_style & (Font::BOLD | Font::ITALIC)) {
@@ -260,12 +264,13 @@
         traits |= kCTFontBoldTrait;
       if (style.font_style & Font::ITALIC)
         traits |= kCTFontItalicTrait;
-      CTFontRef styled_font =
-          CTFontCreateCopyWithSymbolicTraits(font, 0.0, NULL, traits, traits);
+      base::mac::ScopedCFTypeRef<CTFontRef> styled_font(
+          CTFontCreateCopyWithSymbolicTraits(font, 0.0, NULL, traits, traits));
       // TODO(asvitkine): Handle |styled_font| == NULL case better.
       if (styled_font) {
         CFAttributedStringSetAttribute(attr_string, range, kCTFontAttributeName,
                                        styled_font);
+        CFArrayAppendValue(attributes_, styled_font);
       }
     }
   }