summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 12:17:34 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 12:17:34 +0000
commitcbb661076550a2639f6891598e9b90526ce50a92 (patch)
tree55e013c6cfbed7f893163a62c39f46ff905b4817 /base/allocator
parent699f001d13a324ee99dcb5965878fde6c6cfa3f0 (diff)
downloadchromium_src-cbb661076550a2639f6891598e9b90526ce50a92.zip
chromium_src-cbb661076550a2639f6891598e9b90526ce50a92.tar.gz
chromium_src-cbb661076550a2639f6891598e9b90526ce50a92.tar.bz2
Revert 85898 - Re-land http://codereview.chromium.org/6869009 (except for the suppressions)
Introduce the ANNOTATE_LEAKING_OBJECT_PTR annotation that can be used to mark heap allocated objects as intentionally leaked ones. Annotate the histograms produced by {Histogram,BooleanHistogram,LinearHistogram,CustomHistogram}::FactoryGet(), as leaked. Rename StatsHistogram::StatsHistogramFactoryGet to StatsHistogram::FactoryGet, annotate the result as leaky. The previous commit broke the build on Linux Heapcheck, but looks like the problem has gone now. TBR=jar,willchan BUG=79322 Review URL: http://codereview.chromium.org/7048005 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/7049006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
-rw-r--r--base/allocator/allocator.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index f289149..1e96171 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -338,7 +338,6 @@
# Do the same for heap leak checker.
'-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
'-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
- '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv',
]},
}],
[ 'linux_use_debugallocation==1', {