summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 01:44:21 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 01:44:21 +0000
commitbc0e93da2f6a572a9db42dcb7b168a0dac5ff028 (patch)
tree4910f675d6f5be45218006a2df8f01ade3a6abb7 /base
parentf8893079eb8f11a6b11a786ff08d86f8883a8fa0 (diff)
downloadchromium_src-bc0e93da2f6a572a9db42dcb7b168a0dac5ff028.zip
chromium_src-bc0e93da2f6a572a9db42dcb7b168a0dac5ff028.tar.gz
chromium_src-bc0e93da2f6a572a9db42dcb7b168a0dac5ff028.tar.bz2
Revert 95441
This attempted fix for the bug referenced below did not help. Original message: TaskClosureAdapter::Run does not invoke the task if it is null. This is an attempt to fix http://crbug.com/81449. If this actually fixes it then there is probably something more fundamentally wrong. BUG=81449 Review URL: http://codereview.chromium.org/7598015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/task.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/base/task.cc b/base/task.cc
index a862cac..8c61473 100644
--- a/base/task.cc
+++ b/base/task.cc
@@ -53,11 +53,9 @@ TaskClosureAdapter::~TaskClosureAdapter() {
}
void TaskClosureAdapter::Run() {
- if (task_) {
- task_->Run();
- delete task_;
- task_ = NULL;
- }
+ task_->Run();
+ delete task_;
+ task_ = NULL;
}
// Don't leak tasks by default.