diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 20:01:44 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 20:01:44 +0000 |
| commit | 67aa35ac34e86338e97132c5fb6996b1b4653ecf (patch) | |
| tree | 32c95ee82f497f8aa7a84b986efe65e4a513bb77 /base/message_loop.cc | |
| parent | 9face0d972cfb884ac5086d423ced9b44732e1d2 (diff) | |
| download | chromium_src-67aa35ac34e86338e97132c5fb6996b1b4653ecf.zip chromium_src-67aa35ac34e86338e97132c5fb6996b1b4653ecf.tar.gz chromium_src-67aa35ac34e86338e97132c5fb6996b1b4653ecf.tar.bz2 | |
Revert "Cleanup pending tasks under Valgrind as well." (r21429)
This reverts commit 26f9edf949e1678d4f8a3479518568b8a6e1972c.
Review URL: http://codereview.chromium.org/160033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index da463b1..fbdc94f 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -372,8 +372,10 @@ 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(OS_WIN) +#ifdef PURIFY delete pending_task.task; +#endif // PURIFY #elif defined(OS_POSIX) if (RUNNING_ON_VALGRIND) delete pending_task.task; @@ -383,19 +385,13 @@ bool MessageLoop::DeletePendingTasks() { did_work |= !deferred_non_nestable_work_queue_.empty(); while (!deferred_non_nestable_work_queue_.empty()) { // TODO(darin): Delete all tasks once it is safe to do so. - // Until it is totaly safe, only delete them under Purify and Valgrind. -#if defined(PURIFY) + // Until it is totaly safe, just delete them to keep purify happy. +#ifdef PURIFY Task* task = deferred_non_nestable_work_queue_.front().task; -#elif defined(OS_POSIX) - if (RUNNING_ON_VALGRIND) - Task* task = deferred_non_nestable_work_queue_.front().task; #endif deferred_non_nestable_work_queue_.pop(); -#if defined(PURIFY) +#ifdef PURIFY delete task; -#elif defined(OS_POSIX) - if (RUNNING_ON_VALGRIND) - delete task; #endif } did_work |= !delayed_work_queue_.empty(); |