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/debug | |
| 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/debug')
| -rw-r--r-- | base/debug/leak_annotations.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h index 2d636f2..e1086fe 100644 --- a/base/debug/leak_annotations.h +++ b/base/debug/leak_annotations.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -18,22 +18,10 @@ #define ANNOTATE_SCOPED_MEMORY_LEAK \ HeapLeakChecker::Disabler heap_leak_checker_disabler -// Annotate an object pointer as referencing a leaky object. This object and all -// the heap objects referenced by it will be ignored by the heap checker. -// -// X should be referencing an active allocated object. If it is not, the -// annotation will be ignored. -// No object should be annotated with ANNOTATE_SCOPED_MEMORY_LEAK twice. -// Once an object is annotated with ANNOTATE_SCOPED_MEMORY_LEAK, it cannot be -// deleted. -#define ANNOTATE_LEAKING_OBJECT_PTR(X) \ - HeapLeakChecker::IgnoreObject(X) - #else // If tcmalloc is not used, the annotations should be no-ops. #define ANNOTATE_SCOPED_MEMORY_LEAK -#define ANNOTATE_LEAKING_OBJECT_PTR(X) #endif |