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
parent 02cd6980
...@@ -312,10 +312,11 @@ ...@@ -312,10 +312,11 @@
# Provide a way to force disable debugallocation in Debug builds, # Provide a way to force disable debugallocation in Debug builds,
# e.g. for profiling (it's more rare to profile Debug builds, # e.g. for profiling (it's more rare to profile Debug builds,
# but people sometimes need to do that). # but people sometimes need to do that).
'disable_debugallocation%': 1, 'disable_debugallocation%': 0,
}, },
'conditions': [ 'conditions': [
['disable_debugallocation==0', { # TODO(phajdan.jr): Also enable on Windows.
['disable_debugallocation==0 and OS!="win"', {
'defines': [ 'defines': [
# Use debugallocation for Debug builds to catch problems early # Use debugallocation for Debug builds to catch problems early
# and cleanly, http://crbug.com/30715 . # and cleanly, http://crbug.com/30715 .
......
...@@ -61,7 +61,6 @@ Histogram* StatisticsRecorder::RegisterOrDeleteDuplicate(Histogram* histogram) { ...@@ -61,7 +61,6 @@ Histogram* StatisticsRecorder::RegisterOrDeleteDuplicate(Histogram* histogram) {
{ {
base::AutoLock auto_lock(*lock_); base::AutoLock auto_lock(*lock_);
if (histograms_ == NULL) { if (histograms_ == NULL) {
ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322
histogram_to_return = histogram; histogram_to_return = histogram;
} else { } else {
const string& name = histogram->histogram_name(); const string& name = histogram->histogram_name();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment