diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 08:42:55 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 08:42:55 +0000 |
| commit | c736d3cc492a2e7fff505069ad1df01926359352 (patch) | |
| tree | a98c227cb3462221e1716b0bad96113615e1e010 /base/metrics/histogram.cc | |
| parent | 404fcd6d813d0b78d6236029673e98fb914815e1 (diff) | |
| download | chromium_src-c736d3cc492a2e7fff505069ad1df01926359352.zip chromium_src-c736d3cc492a2e7fff505069ad1df01926359352.tar.gz chromium_src-c736d3cc492a2e7fff505069ad1df01926359352.tar.bz2 | |
Revert 86990 - Fix http://codereview.chromium.org/6869009 to ignore an existing object exactly once and land the CL again:
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, update the suppressions.
BUG=79322
TBR=jar
Review URL: http://codereview.chromium.org/6976044
TBR=glider@chromium.org
Review URL: http://codereview.chromium.org/7071035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics/histogram.cc')
| -rw-r--r-- | base/metrics/histogram.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 5b6c59e..63e5ae6 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" @@ -98,8 +97,6 @@ Histogram* Histogram::FactoryGet(const std::string& name, tentative_histogram->SetFlags(flags); histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram); - if (histogram == tentative_histogram) - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 } DCHECK_EQ(HISTOGRAM, histogram->histogram_type()); @@ -794,8 +791,6 @@ Histogram* LinearHistogram::FactoryGet(const std::string& name, tentative_histogram->SetFlags(flags); histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram); - if (histogram == tentative_histogram) - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 } DCHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type()); @@ -887,8 +882,6 @@ Histogram* BooleanHistogram::FactoryGet(const std::string& name, Flags flags) { tentative_histogram->SetFlags(flags); histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram); - if (histogram == tentative_histogram) - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 } DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type()); @@ -936,8 +929,6 @@ Histogram* CustomHistogram::FactoryGet(const std::string& name, tentative_histogram->SetFlags(flags); histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram); - if (histogram == tentative_histogram) - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 } DCHECK_EQ(histogram->histogram_type(), CUSTOM_HISTOGRAM); |