summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 03:56:18 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 03:56:18 +0000
commita8125d2a01d5d1f12f6dc23881b457804c904509 (patch)
tree1600803753e9922ce6d44c75a6b2dd547ea3f9fb
parent22e04f5c4c3761b18602c069ca5b286b88053f9e (diff)
downloadchromium_src-a8125d2a01d5d1f12f6dc23881b457804c904509.zip
chromium_src-a8125d2a01d5d1f12f6dc23881b457804c904509.tar.gz
chromium_src-a8125d2a01d5d1f12f6dc23881b457804c904509.tar.bz2
Suppressing a known leak error
Seems like this was never executed in the test. TBR=viettrungluu@chromium.org BUG=33475 TEST=valgrind test should cycle green Review URL: http://codereview.chromium.org/553146 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37495 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/valgrind/memcheck/suppressions.txt11
-rw-r--r--views/controls/menu/native_menu_gtk.cc1
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index eec194a..bb409c7 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -2294,3 +2294,14 @@
fun:ChromeMain
fun:main
}
+{
+ bug_33475
+ Memcheck:Leak
+ fun:_Znw*
+ ...
+ fun:_ZN5views13NativeMenuGtk7RebuildEv
+ fun:_ZN5views5Menu27RebuildEv
+ fun:_ZN5views5Menu2C1EPN5menus9MenuModelE
+ fun:_ZN11ToolbarView15SetAppMenuModelEP12AppMenuModel
+ fun:_ZN8chromeos19ChromeosBrowserView4InitEv
+}
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 99aeec4..1335b85 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -209,6 +209,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
if (type == menus::MenuModel::TYPE_SUBMENU) {
// TODO(beng): we're leaking these objects right now... consider some other
// arrangement.
+ // See http://crbug.com/33475.
Menu2* submenu = new Menu2(model_->GetSubmenuModelAt(index));
static_cast<NativeMenuGtk*>(submenu->wrapper_.get())->set_parent(this);
g_object_set_data(G_OBJECT(menu_item), "submenu", submenu);