summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 20:45:02 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 20:45:02 +0000
commit7139c27f770bdb1c1334fe593e41efac4488a040 (patch)
treeed2f482a01c0cc345b4f6091c89f7e67754e3ca3
parentc1efe6563fd6caab5bd06852b8f1cd4f3f1bfa97 (diff)
downloadchromium_src-7139c27f770bdb1c1334fe593e41efac4488a040.zip
chromium_src-7139c27f770bdb1c1334fe593e41efac4488a040.tar.gz
chromium_src-7139c27f770bdb1c1334fe593e41efac4488a040.tar.bz2
Fix a leak in RenderWidgetHostViewCocoa and remove its suppression
BUG=18540 TEST=Valgrind Mac bots should stay green Review URL: http://codereview.chromium.org/174293 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24138 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.mm3
-rw-r--r--tools/valgrind/memcheck/suppressions_mac.txt18
2 files changed, 2 insertions, 19 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index c047f41..af3ce8a 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -49,7 +49,7 @@ RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
: render_widget_host_(widget),
about_to_validate_and_paint_(false),
- im_attributes_(NULL),
+ im_attributes_(nil),
im_composing_(false),
is_loading_(false),
is_hidden_(false),
@@ -61,6 +61,7 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
}
RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
+ [im_attributes_ release];
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index d2082ba..c4e27da 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -156,24 +156,6 @@
fun:ActivateTSMDocument
}
{
- bug_18540
- Memcheck:Leak
- fun:malloc_zone_malloc
- fun:_CFRuntimeCreateInstance
- fun:__CFArrayInit
- fun:CFArrayCreate
- fun:-[__NSPlaceholderArray initWithObjects:count:]
- fun:-[NSArray initWithObjects:]
- fun:-[RenderWidgetHostViewCocoa validAttributesForMarkedText]
- fun:-[NSTSMInputContext initWithClient:]
- fun:+[NSInputContext inputContextWithClient:]
- fun:-[NSView inputContext]
- fun:+[NSInputContext currentInputContext]
- fun:+[NSInputContext updateInputContexts]
- fun:-[NSApplication updateWindows]
- fun:_handleWindowsNeedUpdateNote
-}
-{
# Looks like an Apple bug; has no visual impact.
unitialized_rect_allocated_on_stack_when_reparenting_window_content_views
Memcheck:Cond