gtk: Fix memory leak in ThemeServiceGtk::LoadGtkValues.

chrome/browser/ui/gtk/theme_service_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
@@ skipping 760 matching lines @@
 
   SetThemeColorFromGtk(ThemeService::COLOR_NTP_LINK,
                        link_color);
   SetThemeColorFromGtk(ThemeService::COLOR_NTP_LINK_UNDERLINE,
                        link_color);
   SetThemeColorFromGtk(ThemeService::COLOR_NTP_SECTION_LINK,
                        link_color);
   SetThemeColorFromGtk(ThemeService::COLOR_NTP_SECTION_LINK_UNDERLINE,
                        link_color);
 
+  if (!gdk_color_equal(link_color, &kDefaultLinkColor))

[John Knottenbelt, 2012/03/27 14:45:47]

We need to compare address, rather than value. 
Also, gdk_color_free shouldn't be called on a NULL pointer (See
http://git.gnome.org/browse/gtk+/tree/gdk/gdkcolor.c#n70 and
http://git.gnome.org/browse/glib/tree/glib/gmessages.h#n275 ). This could work:

if (link_color && link_color != &kDefaultLinkColor)

Alternatively, it might be neater to introduce a separate variable for the
result of gtk_widget_style_get (up to you).

[tfarina, 2012/03/27 15:29:06]

Done.

+    gdk_color_free(const_cast<GdkColor*>(link_color));
+
   // Generate the colors that we pass to WebKit.
   focus_ring_color_ = gfx::GdkColorToSkColor(frame_color);
   GdkColor thumb_active_color, thumb_inactive_color, track_color;
   ThemeServiceGtk::GetScrollbarColors(&thumb_active_color,
                                       &thumb_inactive_color,
                                       &track_color);
   thumb_active_color_ = gfx::GdkColorToSkColor(thumb_active_color);
   thumb_inactive_color_ = gfx::GdkColorToSkColor(thumb_inactive_color);
   track_color_ = gfx::GdkColorToSkColor(track_color);
 
   // Some GTK themes only define the text selection colors on the GtkEntry
   // class, so we need to use that for getting selection colors.
   active_selection_bg_color_ =
       gfx::GdkColorToSkColor(entry_style->base[GTK_STATE_SELECTED]);
   active_selection_fg_color_ =
       gfx::GdkColorToSkColor(entry_style->text[GTK_STATE_SELECTED]);
   inactive_selection_bg_color_ =
       gfx::GdkColorToSkColor(entry_style->base[GTK_STATE_ACTIVE]);
   inactive_selection_fg_color_ =
       gfx::GdkColorToSkColor(entry_style->text[GTK_STATE_ACTIVE]);
 }
 
 GdkColor ThemeServiceGtk::BuildFrameColors(GtkStyle* frame_style) {
-  const GdkColor* theme_frame = NULL;
-  const GdkColor* theme_inactive_frame = NULL;
-  const GdkColor* theme_incognito_frame = NULL;
-  const GdkColor* theme_incognito_inactive_frame = NULL;
+  GdkColor* theme_frame = NULL;
+  GdkColor* theme_inactive_frame = NULL;
+  GdkColor* theme_incognito_frame = NULL;
+  GdkColor* theme_incognito_inactive_frame = NULL;
   gtk_widget_style_get(GTK_WIDGET(fake_frame_),
                        "frame-color", &theme_frame,
                        "inactive-frame-color", &theme_inactive_frame,
                        "incognito-frame-color", &theme_incognito_frame,
                        "incognito-inactive-frame-color",
                        &theme_incognito_inactive_frame,
                        NULL);
 
   GdkColor frame_color = BuildAndSetFrameColor(
       &frame_style->bg[GTK_STATE_SELECTED],
       theme_frame,
       kDefaultFrameShift,
       ThemeService::COLOR_FRAME,
       ThemeService::TINT_FRAME);
+  gdk_color_free(theme_frame);

[John Knottenbelt, 2012/03/27 14:45:47]

We need to check for NULL here and in the other calls to gdk_color_free below
too.

[tfarina, 2012/03/27 15:29:06]

Done.

   SetThemeTintFromGtk(ThemeService::TINT_BACKGROUND_TAB, &frame_color);
 
   BuildAndSetFrameColor(
       &frame_style->bg[GTK_STATE_INSENSITIVE],
       theme_inactive_frame,
       kDefaultFrameShift,
       ThemeService::COLOR_FRAME_INACTIVE,
       ThemeService::TINT_FRAME_INACTIVE);
+  gdk_color_free(theme_inactive_frame);
 
   BuildAndSetFrameColor(
       &frame_color,
       theme_incognito_frame,
       GetDefaultTint(ThemeService::TINT_FRAME_INCOGNITO),
       ThemeService::COLOR_FRAME_INCOGNITO,
       ThemeService::TINT_FRAME_INCOGNITO);
+  gdk_color_free(theme_incognito_frame);
 
   BuildAndSetFrameColor(
       &frame_color,
       theme_incognito_inactive_frame,
       GetDefaultTint(ThemeService::TINT_FRAME_INCOGNITO_INACTIVE),
       ThemeService::COLOR_FRAME_INCOGNITO_INACTIVE,
       ThemeService::TINT_FRAME_INCOGNITO_INACTIVE);
+  gdk_color_free(theme_incognito_inactive_frame);
 
   return frame_color;
 }
 
 void ThemeServiceGtk::LoadDefaultValues() {
   focus_ring_color_ = SkColorSetARGB(255, 229, 151, 0);
   thumb_active_color_ = SkColorSetRGB(244, 244, 244);
   thumb_inactive_color_ = SkColorSetRGB(234, 234, 234);
   track_color_ = SkColorSetRGB(211, 211, 211);
 
@@ skipping 132 matching lines @@
   // We use two colors: the main color (passed in) and a lightened version of
   // that color (which is supposed to match the light gradient at the top of
   // several GTK+ themes, such as Ambiance, Clearlooks or Bluebird).
   ColorMap::const_iterator it = colors_.find(color_id);
   DCHECK(it != colors_.end());
   SkColor base = it->second;
 
   gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight), true);
 
   int gradient_size;
-  const GdkColor* gradient_top_color = NULL;
+  GdkColor* gradient_top_color = NULL;
   gtk_widget_style_get(GTK_WIDGET(fake_frame_),
                        "frame-gradient-size", &gradient_size,
                        gradient_name, &gradient_top_color,
                        NULL);
   if (gradient_size) {
     SkColor lighter = gradient_top_color ?
         gfx::GdkColorToSkColor(*gradient_top_color) :
         color_utils::HSLShift(base, kGtkFrameShift);
+    gdk_color_free(gradient_top_color);
     SkShader* shader = gfx::CreateGradientShader(
         0, gradient_size, lighter, base);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     paint.setShader(shader);
     shader->unref();
 
     canvas.DrawRect(gfx::Rect(0, 0, kToolbarImageWidth, gradient_size), paint);
   }
@@ skipping 111 matching lines @@
   cairo_new_path(cr);
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, allocation.y);
   cairo_line_to(cr, start_x, allocation.y + allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }