From bdd3dee739943bc08a168ff8d64c62c61ea51edb Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Sat, 2 Jun 2012 06:07:00 +0000 Subject: fix a couple apparent memory leaks and add a suppression and remove a suppression BUG=130640,114979 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10451102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140183 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc | 2 +- chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc | 2 +- chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/ui/gtk/bookmarks') diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index a63ee05..d4e83cc 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -574,7 +574,7 @@ void BookmarkEditorGtk::AddNewFolder(GtkTreeIter* parent, GtkTreeIter* child) { gtk_tree_store_set( tree_store_, child, bookmark_utils::FOLDER_ICON, - GtkThemeService::GetFolderIcon(true)->ToGdkPixbuf(), + GtkThemeService::GetFolderIcon(true).ToGdkPixbuf(), bookmark_utils::FOLDER_NAME, l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME).c_str(), bookmark_utils::ITEM_ID, static_cast(0), diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc index d57b42a..8e796dd 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc @@ -27,7 +27,7 @@ void AddSingleNodeToTreeStore(GtkTreeStore* store, const BookmarkNode* node, // differently). gtk_tree_store_set(store, iter, bookmark_utils::FOLDER_ICON, - GtkThemeService::GetFolderIcon(true)->ToGdkPixbuf(), + GtkThemeService::GetFolderIcon(true).ToGdkPixbuf(), bookmark_utils::FOLDER_NAME, UTF16ToUTF8(node->GetTitle()).c_str(), bookmark_utils::ITEM_ID, node->id(), diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc index cfa4dad..133ee51 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc @@ -172,11 +172,11 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model, if (model->GetFavicon(node).width() != 0) { pixbuf = gfx::GdkPixbufFromSkBitmap(model->GetFavicon(node)); } else { - pixbuf = GtkThemeService::GetDefaultFavicon(native)->ToGdkPixbuf(); + pixbuf = GtkThemeService::GetDefaultFavicon(native).ToGdkPixbuf(); g_object_ref(pixbuf); } } else { - pixbuf = GtkThemeService::GetFolderIcon(native)->ToGdkPixbuf(); + pixbuf = GtkThemeService::GetFolderIcon(native).ToGdkPixbuf(); g_object_ref(pixbuf); } -- cgit v1.1