diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 12:17:34 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 12:17:34 +0000 |
| commit | cbb661076550a2639f6891598e9b90526ce50a92 (patch) | |
| tree | 55e013c6cfbed7f893163a62c39f46ff905b4817 /base/metrics | |
| parent | 699f001d13a324ee99dcb5965878fde6c6cfa3f0 (diff) | |
| download | chromium_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/metrics')
| -rw-r--r-- | base/metrics/histogram.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 3c72b387..4262853 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -14,7 +14,6 @@ #include <algorithm> #include <string> -#include "base/debug/leak_annotations.h" #include "base/logging.h" #include "base/pickle.h" #include "base/stringprintf.h" @@ -102,7 +101,6 @@ 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; } @@ -796,7 +794,6 @@ 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; } @@ -887,7 +884,6 @@ 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; } @@ -937,7 +933,6 @@ 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; } |