summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:07:11 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 22:07:11 +0000
commitd7fc97946625fee2c54e18bce4f61608efeeef03 (patch)
treee2033035f58d2342f55cdb677e38d281cc655152 /views/controls/textfield
parentb12d815dbd8295b3e7f5e4b4a7350aebc580270c (diff)
downloadchromium_src-d7fc97946625fee2c54e18bce4f61608efeeef03.zip
chromium_src-d7fc97946625fee2c54e18bce4f61608efeeef03.tar.gz
chromium_src-d7fc97946625fee2c54e18bce4f61608efeeef03.tar.bz2
Fixes two issues from valgrind, and some cleanup:
. Makes it so observer installed by WidgetGtk is cleaned up and not leaked. . Removes unnecessary static_cast<int> in view. . Fixes some leaks in textfield and button. . Removes AutocompletePopupViewGTK's copy of PangoFontFromGfxFont. BUG=none TEST=none Review URL: http://codereview.chromium.org/420005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield')
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 911ae38..9728a1d 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -121,8 +121,10 @@ void NativeTextfieldGtk::UpdateReadOnly() {
void NativeTextfieldGtk::UpdateFont() {
if (!native_view())
return;
- gtk_widget_modify_font(native_view(),
- gfx::Font::PangoFontFromGfxFont(textfield_->font()));
+ PangoFontDescription* pfd =
+ gfx::Font::PangoFontFromGfxFont(textfield_->font());
+ gtk_widget_modify_font(native_view(), pfd);
+ pango_font_description_free(pfd);
}
void NativeTextfieldGtk::UpdateEnabled() {