summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-02 06:23:48 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-02 06:23:48 +0000
commit5d15ae918f5b07bb5203ee001cdefd9058ddac86 (patch)
treed0776910d4c86344884114ccaa6cf51d2ac72f96
parent74a422edbf6b455f83931548c5aeee0f454c9520 (diff)
downloadchromium_src-5d15ae918f5b07bb5203ee001cdefd9058ddac86.zip
chromium_src-5d15ae918f5b07bb5203ee001cdefd9058ddac86.tar.gz
chromium_src-5d15ae918f5b07bb5203ee001cdefd9058ddac86.tar.bz2
Call ResetBirthTime before dispatching the user's Task. Also, remove PostSignaledTask since it won't be used.
TBR=jar git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/message_loop.cc9
-rw-r--r--base/message_loop.h4
-rw-r--r--base/object_watcher.cc1
3 files changed, 1 insertions, 13 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 84b6a04..7d2fbff 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -342,15 +342,6 @@ void MessageLoop::PostDelayedTask(const tracked_objects::Location& from_here,
PostTaskInternal(task);
}
-void MessageLoop::PostSignaledTask(Task* task) {
- DCHECK(!task->MissingBirthplace());
- task->ResetBirthTime();
- DCHECK(!task->is_owned_by_message_loop());
- task->set_posted_task_delay(0); // Run ASAP, and we take ownership.
- DCHECK(task->is_owned_by_message_loop());
- PostTaskInternal(task);
-}
-
void MessageLoop::PostTaskInternal(Task* task) {
// Warning: Don't try to short-circuit, and handle this thread's tasks more
// directly, as it could starve handling of foreign threads. Put every task
diff --git a/base/message_loop.h b/base/message_loop.h
index d67c08e..1610d07 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -543,10 +543,6 @@ class MessageLoop {
// Do a PostMessage(), and crash if we can't eventually do the post.
void EnsureMessageGetsPosted(int message) const;
- // Post a task that an object watcher has already initialized with the
- // place of birth.
- void PostSignaledTask(Task* task);
-
// Post a task to our incomming queue.
void MessageLoop::PostTaskInternal(Task* task);
diff --git a/base/object_watcher.cc b/base/object_watcher.cc
index 95c0b64..c16f917 100644
--- a/base/object_watcher.cc
+++ b/base/object_watcher.cc
@@ -57,6 +57,7 @@ struct ObjectWatcher::Watch : public Task {
watcher->CancelWatch(object);
+ task_to_run->ResetBirthTime();
task_to_run->Run();
delete task_to_run;
}