diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 20:50:52 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 20:50:52 +0000 |
| commit | e91f9423f6dab15a77d11c9c7c44a832364d9f92 (patch) | |
| tree | 7648229baddd468b434f9c74b8639f1e101665f2 /base/message_loop.cc | |
| parent | 9870279514ac12ef9e2bbe7aa622e7ebd5931b94 (diff) | |
| download | chromium_src-e91f9423f6dab15a77d11c9c7c44a832364d9f92.zip chromium_src-e91f9423f6dab15a77d11c9c7c44a832364d9f92.tar.gz chromium_src-e91f9423f6dab15a77d11c9c7c44a832364d9f92.tar.bz2 | |
During shutdown delete any pending tasks if running under Heapchecker.
BUG=50345
TEST=Suppression no longer gets used.
Review URL: http://codereview.chromium.org/3791006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 8f6c997b..af1032c 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -470,7 +470,7 @@ bool MessageLoop::DeletePendingTasks() { // TODO(darin): Delete all tasks once it is safe to do so. // Until it is totally safe, just do it when running Purify or // Valgrind. -#if defined(PURIFY) +#if defined(PURIFY) || defined(USE_HEAPCHECKER) delete pending_task.task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) @@ -483,7 +483,7 @@ bool MessageLoop::DeletePendingTasks() { // TODO(darin): Delete all tasks once it is safe to do so. // Until it is totaly safe, only delete them under Purify and Valgrind. Task* task = NULL; -#if defined(PURIFY) +#if defined(PURIFY) || defined(USE_HEAPCHECKER) task = deferred_non_nestable_work_queue_.front().task; #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) |