diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 10:31:00 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 10:31:00 +0000 |
| commit | a5b7b7d090670613f099b13f2edd341ed0ae0267 (patch) | |
| tree | d5fc321019ad2246419edf9700e3a9abdafb2940 /base/metrics | |
| parent | fd1cc5a88f528d58d311b24bf2b1b9b437369b30 (diff) | |
| download | chromium_src-a5b7b7d090670613f099b13f2edd341ed0ae0267.zip chromium_src-a5b7b7d090670613f099b13f2edd341ed0ae0267.tar.gz chromium_src-a5b7b7d090670613f099b13f2edd341ed0ae0267.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
| -rw-r--r-- | base/metrics/histogram.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 4262853..3c72b387 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -14,6 +14,7 @@ #include <algorithm> #include <string> +#include "base/debug/leak_annotations.h" #include "base/logging.h" #include "base/pickle.h" #include "base/stringprintf.h" @@ -101,6 +102,7 @@ Histogram* Histogram::FactoryGet(const std::string& name, DCHECK_EQ(HISTOGRAM, histogram->histogram_type()); DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count)); + ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -794,6 +796,7 @@ Histogram* LinearHistogram::FactoryGet(const std::string& name, DCHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type()); DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count)); + ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -884,6 +887,7 @@ Histogram* BooleanHistogram::FactoryGet(const std::string& name, Flags flags) { } DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type()); + ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -933,6 +937,7 @@ Histogram* CustomHistogram::FactoryGet(const std::string& name, DCHECK_EQ(histogram->histogram_type(), CUSTOM_HISTOGRAM); DCHECK(histogram->HasConstructorArguments(ranges[1], ranges.back(), ranges.size())); + ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } |