diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 22:07:11 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 22:07:11 +0000 |
| commit | d7fc97946625fee2c54e18bce4f61608efeeef03 (patch) | |
| tree | e2033035f58d2342f55cdb677e38d281cc655152 /views/controls | |
| parent | b12d815dbd8295b3e7f5e4b4a7350aebc580270c (diff) | |
| download | chromium_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')
| -rw-r--r-- | views/controls/button/native_button_gtk.cc | 7 | ||||
| -rw-r--r-- | views/controls/textfield/native_textfield_gtk.cc | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index 17a25e2..e663db6 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -40,9 +40,10 @@ void NativeButtonGtk::UpdateFont() { if (!native_view()) return; - gtk_widget_modify_font( - native_view(), - gfx::Font::PangoFontFromGfxFont(native_button_->font())); + PangoFontDescription* pfd = + gfx::Font::PangoFontFromGfxFont(native_button_->font()); + gtk_widget_modify_font(native_view(), pfd); + pango_font_description_free(pfd); preferred_size_ = gfx::Size(); } 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() { |