| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/worker/worker_thread.h" | 5 #include "content/worker/worker_thread.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/threading/thread_local.h" | 9 #include "base/threading/thread_local.h" |
| 10 #include "chrome/worker/webworker_stub.h" | |
| 11 #include "chrome/worker/websharedworker_stub.h" | |
| 12 #include "chrome/worker/worker_webkitclient_impl.h" | |
| 13 #include "content/common/appcache/appcache_dispatcher.h" | 10 #include "content/common/appcache/appcache_dispatcher.h" |
| 14 #include "content/common/content_switches.h" | 11 #include "content/common/content_switches.h" |
| 15 #include "content/common/db_message_filter.h" | 12 #include "content/common/db_message_filter.h" |
| 16 #include "content/common/web_database_observer_impl.h" | 13 #include "content/common/web_database_observer_impl.h" |
| 17 #include "content/common/worker_messages.h" | 14 #include "content/common/worker_messages.h" |
| 15 #include "content/worker/webworker_stub.h" |
| 16 #include "content/worker/websharedworker_stub.h" |
| 17 #include "content/worker/worker_webkitclient_impl.h" |
| 18 #include "ipc/ipc_sync_channel.h" | 18 #include "ipc/ipc_sync_channel.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" |
| 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" |
| 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
| 23 #include "webkit/glue/webkit_glue.h" | 23 #include "webkit/glue/webkit_glue.h" |
| 24 | 24 |
| 25 using WebKit::WebRuntimeFeatures; | 25 using WebKit::WebRuntimeFeatures; |
| 26 | 26 |
| 27 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls( | 27 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls( |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 } | 118 } |
| 119 } | 119 } |
| 120 | 120 |
| 121 void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) { | 121 void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) { |
| 122 worker_stubs_.erase(stub); | 122 worker_stubs_.erase(stub); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) { | 125 void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) { |
| 126 worker_stubs_.insert(stub); | 126 worker_stubs_.insert(stub); |
| 127 } | 127 } |
| OLD | NEW |