Prepare chromium for WorkerThread migration to WebThread.

content/child/worker_task_runner.cc

Index: content/child/worker_task_runner.cc
diff --git a/content/child/worker_task_runner.cc b/content/child/worker_task_runner.cc
index 02c4bab320f4145476bd1d5cee56bc02a45d1c21..8b7b54c1725d751e4120a694b0352f073566318f 100644
--- a/content/child/worker_task_runner.cc
+++ b/content/child/worker_task_runner.cc
@@ -16,11 +16,22 @@ namespace content {
 
 namespace {
 
-class RunClosureTask : public WebWorkerRunLoop::Task {
+class RunLoopRunClosureTask : public WebWorkerRunLoop::Task {
+ public:
+  RunLoopRunClosureTask(const base::Closure& task) : task_(task) {}
+  virtual ~RunLoopRunClosureTask() {}
+  virtual void Run() {
+    task_.Run();
+  }
+ private:
+  base::Closure task_;
+};
+
+class RunClosureTask : public blink::WebThread::Task {
  public:
   RunClosureTask(const base::Closure& task) : task_(task) {}
   virtual ~RunClosureTask() {}
-  virtual void Run() {
+  virtual void run() {
     task_.Run();
   }
  private:
@@ -31,10 +42,14 @@ class RunClosureTask : public WebWorkerRunLoop::Task {
 
 struct WorkerTaskRunner::ThreadLocalState {
   ThreadLocalState(int id, const WebWorkerRunLoop& loop)
-      : id_(id), run_loop_(loop) {
+      : id_(id), run_loop_(loop), thread_(0) {
+  }
+  ThreadLocalState(int id, blink::WebThread* thread)
+      : id_(id), thread_(thread) {
   }
   int id_;
   WebWorkerRunLoop run_loop_;
+  blink::WebThread* thread_;
   ObserverList<WorkerTaskRunner::Observer> stop_observers_;
 };
 
@@ -48,18 +63,31 @@ bool WorkerTaskRunner::PostTask(
     int id, const base::Closure& closure) {
   DCHECK(id > 0);
   base::AutoLock locker(loop_map_lock_);
+
   IDToLoopMap::iterator found = loop_map_.find(id);
-  if (found == loop_map_.end())
-    return false;
-  return found->second.postTask(new RunClosureTask(closure));
+  if (found != loop_map_.end())
+    return found->second.postTask(new RunLoopRunClosureTask(closure));
+
+  IDToThreadMap::iterator thread_found = thread_map_.find(id);
+  if (thread_found != thread_map_.end()) {
+    thread_found->second->postTask(new RunClosureTask(closure));
+    return true;
+  }
+
+  return false;
 }
 
 int WorkerTaskRunner::PostTaskToAllThreads(const base::Closure& closure) {
   base::AutoLock locker(loop_map_lock_);
   IDToLoopMap::iterator it;
   for (it = loop_map_.begin(); it != loop_map_.end(); ++it)
-    it->second.postTask(new RunClosureTask(closure));
-  return static_cast<int>(loop_map_.size());
+    it->second.postTask(new RunLoopRunClosureTask(closure));
+
+  IDToThreadMap::iterator iter;
+  for (iter = thread_map_.begin(); iter != thread_map_.end(); ++iter)
+    iter->second->postTask(new RunClosureTask(closure));
+
+  return static_cast<int>(loop_map_.size() + thread_map_.size());
 }
 
 int WorkerTaskRunner::CurrentWorkerId() {
@@ -109,4 +137,26 @@ void WorkerTaskRunner::OnWorkerRunLoopStopped(const WebWorkerRunLoop& loop) {
   current_tls_.Set(NULL);
 }
 
+void WorkerTaskRunner::OnWorkerThreadStarted(blink::WebThread* thread) {
+  DCHECK(!current_tls_.Get());
+  int id = id_sequence_.GetNext();
+  current_tls_.Set(new ThreadLocalState(id, thread));
+
+  base::AutoLock locker_(loop_map_lock_);
+  thread_map_[id] = thread;
+}
+
+void WorkerTaskRunner::OnWorkerThreadStopped(blink::WebThread* thread) {
+  DCHECK(current_tls_.Get());
+  FOR_EACH_OBSERVER(Observer, current_tls_.Get()->stop_observers_,
+                    OnWorkerRunLoopStopped());
+  {
+    base::AutoLock locker(loop_map_lock_);
+    DCHECK(thread_map_[CurrentWorkerId()] == thread);
+    thread_map_.erase(CurrentWorkerId());
+  }
+  delete current_tls_.Get();
+  current_tls_.Set(NULL);
+}
+
 }  // namespace content