summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/webworkerclient_proxy.cc6
-rw-r--r--chrome/worker/worker_webkitclient_impl.cc6
-rw-r--r--chrome/worker/worker_webkitclient_impl.h1
3 files changed, 6 insertions, 7 deletions
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 2c57dad..003a860 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -7,6 +7,7 @@
#include "chrome/common/child_process.h"
#include "chrome/common/ipc_logging.h"
#include "chrome/common/worker_messages.h"
+#include "chrome/renderer/webworker_proxy.h"
#include "chrome/worker/worker_thread.h"
#include "webkit/api/public/WebString.h"
#include "webkit/api/public/WebURL.h"
@@ -70,6 +71,11 @@ void WebWorkerClientProxy::workerContextDestroyed() {
delete this;
}
+WebKit::WebWorker* WebWorkerClientProxy::createWorker(
+ WebKit::WebWorkerClient* client) {
+ return new WebWorkerProxy(client, WorkerThread::current(), 0);
+}
+
bool WebWorkerClientProxy::Send(IPC::Message* message) {
return WorkerThread::current()->Send(message);
}
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 21d715ab..1861b64 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -5,7 +5,6 @@
#include "chrome/worker/worker_webkitclient_impl.h"
#include "base/logging.h"
-#include "chrome/renderer/webworker_proxy.h"
#include "chrome/worker/worker_thread.h"
#include "webkit/api/public/WebString.h"
#include "webkit/api/public/WebURL.h"
@@ -57,8 +56,3 @@ WebKit::WebString WorkerWebKitClientImpl::defaultLocale() {
NOTREACHED();
return WebKit::WebString();
}
-
-WebKit::WebWorker* WorkerWebKitClientImpl::createWorker(
- WebKit::WebWorkerClient* client) {
- return new WebWorkerProxy(client, WorkerThread::current(), 0);
-}
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index 61d8824..474e1b2 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -23,7 +23,6 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
const WebKit::WebURL& policy_url);
virtual void prefetchHostName(const WebKit::WebString&);
virtual WebKit::WebString defaultLocale();
- virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client);
};
#endif // CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_