gtk: Make GtkThemeProvider own the gtk label widget. The widget is not added...

gtk: Make GtkThemeProvider own the gtk label widget.  The widget is not added to a container, so we don't have the convenience of having it destroyed by the container.

BUG=none
TEST=Watch the Linux UI valgrind bot get a little greener.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=21228

[Elliot Glaysher, 2009-07-21 21:24:11]

LGTM

On Tue, Jul 21, 2009 at 2:21 PM, <jhawkins@chromium.org> wrote:
> Reviewers: Elliot Glaysher, dank,
>
> Description:
> gtk: Make GtkThemeProvider own the gtk label widget. =A0The widget is not
> added to a container, so we don't have the convenience of having it
> destroyed by the container.
>
> BUG=3Dnone
> TEST=3DWatch the Linux UI valgrind bot get a little greener.
>
> Please review this at http://codereview.chromium.org/159157
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
> =A0MM =A0 =A0chrome/browser/gtk/gtk_theme_provider.h
> =A0MM =A0 =A0chrome/browser/gtk/gtk_theme_provider.cc
>
>
> Index: chrome/browser/gtk/gtk_theme_provider.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- chrome/browser/gtk/gtk_theme_provider.h =A0 =A0 (revision 21211)
> +++ chrome/browser/gtk/gtk_theme_provider.h =A0 =A0 (working copy)
> @@ -9,6 +9,7 @@
>
> =A0#include "chrome/browser/browser_theme_provider.h"
> =A0#include "chrome/common/notification_observer.h"
> +#include "chrome/common/owned_widget_gtk.h"
>
> =A0#include "skia/ext/skia_utils.h"
>
> @@ -93,7 +94,7 @@
> =A0 // GtkWidgets that exist only so we can look at their properties (and=
 take
> =A0 // their colors).
> =A0 GtkWidget* fake_window_;
> - =A0GtkWidget* fake_label_;
> + =A0OwnedWidgetGtk fake_label_;
>
> =A0 // A list of all GtkChromeButton instances. We hold on to these to no=
tify
> =A0 // them of theme changes.
>
> Property changes on: chrome/browser/gtk/gtk_theme_provider.h
> ___________________________________________________________________
> Name: svn:eol-style
> =A0 + LF
>
> Index: chrome/browser/gtk/gtk_theme_provider.cc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- chrome/browser/gtk/gtk_theme_provider.cc =A0 =A0(revision 21211)
> +++ chrome/browser/gtk/gtk_theme_provider.cc =A0 =A0(working copy)
> @@ -37,8 +37,9 @@
>
> =A0GtkThemeProvider::GtkThemeProvider()
> =A0 =A0 : BrowserThemeProvider(),
> - =A0 =A0 =A0fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)),
> - =A0 =A0 =A0fake_label_(gtk_label_new("")) {
> + =A0 =A0 =A0fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)) {
> + =A0fake_label_.Own(gtk_label_new(""));
> +
> =A0 // Only realized widgets receive style-set notifications, which we ne=
ed to
> =A0 // broadcast new theme images and colors.
> =A0 gtk_widget_realize(fake_window_);
> @@ -48,7 +49,7 @@
> =A0GtkThemeProvider::~GtkThemeProvider() {
> =A0 profile()->GetPrefs()->RemovePrefObserver(prefs::kUsesSystemTheme, th=
is);
> =A0 gtk_widget_destroy(fake_window_);
> - =A0gtk_widget_destroy(fake_label_);
> + =A0fake_label_.Destroy();
>
> =A0 // Disconnect from the destroy signal of any redisual widgets in
> =A0 // |chrome_buttons_|.
> @@ -168,7 +169,7 @@
>
> =A0void GtkThemeProvider::LoadGtkValues() {
> =A0 GtkStyle* window_style =3D gtk_rc_get_style(fake_window_);
> - =A0GtkStyle* label_style =3D gtk_rc_get_style(fake_label_);
> + =A0GtkStyle* label_style =3D gtk_rc_get_style(fake_label_.get());
>
> =A0 SetThemeColorFromGtk(kColorFrame, &window_style->bg[GTK_STATE_SELECTE=
D]);
> =A0 // Skip COLOR_FRAME_INACTIVE and the incognito colors, as they will b=
e
>
> Property changes on: chrome/browser/gtk/gtk_theme_provider.cc
> ___________________________________________________________________
> Name: svn:eol-style
> =A0 + LF
>
>
>
>

[dank, 2009-07-21 21:50:45]

I'll buy it