Another day, another round of suppressions from my local continous mac ui valgrind run.

Move one suppression from 6547 to new bug 18664 as we widen it, 'cause 6547 was marked closed, and the history was messy.

Also disable ErrorPageTest.DNSError_GoBack2Forward2 -- it hangs often on mac under valgrind, possibly a bug in valgrind.

BUG=6547,16628,18661,18664
TEST=swing mac around your head on its power cord, see if any memory leaks out

Review URL: http://codereview.chromium.org/165076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22661 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 59 insertions, 13 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index b416b7b..60579d3 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -445,19 +445,6 @@
    fun:_ZN3IPC7Channel11ChannelImpl28OnFileCanReadWithoutBlockingEi
 }
 {
-   # See http://crbug.com/6547
-   # Found by running 20-sharded ui tests over and over, aways in shard 18
-   # after AutomationProxyTest.AutocompleteParallelProxy
-   bug_6547
-   Memcheck:Leak
-   fun:_Znwj
-   fun:_ZN18ResourceDispatcher12CreateBridgeERKSsRK4GURLS4_S4_S1_S1_S1_iiN12ResourceType4TypeEjii
-   fun:_ZN11webkit_glue20ResourceLoaderBridge6CreateERKSsRK4GURLS5_S5_S2_S2_S2_iiN12ResourceType4TypeEii
-   fun:_ZN7WebCore22ResourceHandleInternal5StartEPN11webkit_glue20ResourceLoaderBridge16SyncLoadResponseE
-   fun:_ZN7WebCore14ResourceHandle5startEPNS_5FrameE
-   fun:_ZN7WebCore14ResourceHandle6createERKNS_15ResourceRequestEPNS_20ResourceHandleClientEPNS_5FrameEbbb
-}
-{
    # V8 (or test shell) leak?  See http://crbug.com/9458
    bug_9458
    Memcheck:Leak
@@ -1021,3 +1008,15 @@
    fun:_ZN11WebViewImpl5closeEv
    fun:_ZN12RenderWidget5CloseEv
 }
+{
+   # Originally filed as http://crbug.com/6547, but that was closed
+   # Found by running ui tests over and over
+   bug_18664
+   Memcheck:Leak
+   fun:_Znw*
+   fun:_ZN18ResourceDispatcher12CreateBridgeERKSsRK4GURLS4_S4_S1_S1_S1_iiN12ResourceType4TypeEjii
+   fun:_ZN11webkit_glue20ResourceLoaderBridge6CreateERKSsRK4GURLS5_S5_S2_S2_S2_iiN12ResourceType4TypeEii
+   ...
+   fun:_ZN7WebCore14ResourceHandle5startEPNS_5FrameE
+   fun:_ZN7WebCore14ResourceHandle6createERKNS_15ResourceRequestEPNS_20ResourceHandleClientEPNS_5FrameEbbb
+}
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 375a56ec..68ee8f0 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -456,6 +456,8 @@
    fun:resample_band
    fun:img_interpolate_read
    fun:img_colormatch_read
+   # sometimes fun:img_alphamerge_read
+   ...
    fun:img_data_lock
    fun:CGSImageDataLock
    fun:ripc_AcquireImage
@@ -471,3 +473,48 @@
    fun:_ZN7WebCore11RenderBlock11paintObjectERNS_12RenderObject9PaintInfoEii
    fun:_ZN7WebCore11RenderBlock5paintERNS_12RenderObject9PaintInfoEii
 }
+{
+   # Probably a system leak?
+   bug_16628
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   fun:_CFRuntimeCreateInstance
+   fun:__CFDictionaryInit
+   fun:CARenderOGLNew_
+   fun:view_state_new
+   fun:view_state_acquire
+   fun:view_draw
+   fun:CAViewDraw
+   fun:-[NSView _drawRect:clip:]
+}
+{
+   # System leak?  But we usually tickle it with our throbber...
+   bug_18661
+   fun:realloc
+   fun:sl_stream_finish
+   fun:sl_program_assemble
+   fun:fe_kernel_get_program_string
+   fun:fe_gl_load_programs
+   fun:fe_gl_load_kernel
+   fun:fe_context_test_kernel
+   fun:fe_tree_merge_apply
+   fun:fe_tree_merge_kernels_1
+   ...
+   fun:fe_tree_merge_kernels
+   fun:fe_tree_prepare_tree_
+   fun:fe_tree_render_image
+   fun:fe_image_render_
+   fun:fe_image_render
+   fun:renderImage
+   fun:-[CIOpenGLContextImpl renderWithBounds:matrix:function:info:]
+   fun:-[CIContextImpl render:]
+   fun:cgxcoreimage_instance_render
+   fun:CGXCoreImageInstanceRender
+   fun:ripc_AcquireCoreImage
+   fun:ripc_DrawShading
+   fun:CGContextDrawShading
+   fun:-[CICGContextImpl render:]
+   fun:-[CIContext drawImage:inRect:fromRect:]
+   fun:-[CIImage(NSAppKitAdditions) drawInRect:fromRect:operation:fraction:]
+   fun:-[ThrobberFilmstripDelegate drawFrameInRect:]
+}