summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 20:16:28 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 20:16:28 +0000
commit782c148f5af5d59377148720293408b24d79c7ac (patch)
tree53f1e88bf63d27d2c992787aa05a8860b6bf5c8f /base/allocator
parent02cd6980fbc6180f5b87b97823a03be0df29b696 (diff)
downloadchromium_src-782c148f5af5d59377148720293408b24d79c7ac.zip
chromium_src-782c148f5af5d59377148720293408b24d79c7ac.tar.gz
chromium_src-782c148f5af5d59377148720293408b24d79c7ac.tar.bz2
GTTF: Enable debugallocation by default (try 3 or so).
Also remove invalid ANNOTATE_LEAKING_OBJECT_PTR annotation for an object that _does_ get deleted. This is for now disabled on Windows because of tsan compile issues. TBR=jar BUG=30715 Review URL: https://codereview.chromium.org/11826062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
-rw-r--r--base/allocator/allocator.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index f5bda73..46861ec 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -312,10 +312,11 @@
# Provide a way to force disable debugallocation in Debug builds,
# e.g. for profiling (it's more rare to profile Debug builds,
# but people sometimes need to do that).
- 'disable_debugallocation%': 1,
+ 'disable_debugallocation%': 0,
},
'conditions': [
- ['disable_debugallocation==0', {
+ # TODO(phajdan.jr): Also enable on Windows.
+ ['disable_debugallocation==0 and OS!="win"', {
'defines': [
# Use debugallocation for Debug builds to catch problems early
# and cleanly, http://crbug.com/30715 .