diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webworker_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webworkerclient_impl.cc | 7 |
3 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "46506", + "webkit_revision": "46507", } diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc index 112b85b..6c38ae2 100644 --- a/webkit/glue/webworker_impl.cc +++ b/webkit/glue/webworker_impl.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "DedicatedWorkerContext.h" +#include "DedicatedWorkerThread.h" #include "GenericWorkerTask.h" #include "KURL.h" #include "MessagePort.h" @@ -14,7 +15,6 @@ #include "ScriptExecutionContext.h" #include "SecurityOrigin.h" #include "SubstituteData.h" -#include "WorkerThread.h" #include <wtf/MainThread.h> #include <wtf/Threading.h> @@ -168,7 +168,7 @@ void WebWorkerImpl::startWorkerContext(const WebURL& script_url, // This document will be used as 'loading context' for the worker. loading_document_ = web_frame->frame()->document(); - worker_thread_ = WebCore::WorkerThread::create( + worker_thread_ = WebCore::DedicatedWorkerThread::create( webkit_glue::WebURLToKURL(script_url), webkit_glue::WebStringToString(user_agent), webkit_glue::WebStringToString(source_code), diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc index 1465eda..8ac5662 100644 --- a/webkit/glue/webworkerclient_impl.cc +++ b/webkit/glue/webworkerclient_impl.cc @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" +#include "DedicatedWorkerThread.h" #include "Frame.h" #include "FrameLoaderClient.h" #include "GenericWorkerTask.h" @@ -18,7 +19,6 @@ #include "WorkerMessagingProxy.h" #include "Worker.h" #include "WorkerContext.h" -#include "WorkerThread.h" #include <wtf/Threading.h> #undef LOG @@ -83,8 +83,11 @@ WebCore::WorkerContextProxy* WebCore::WorkerContextProxy::create( return NULL; } + WebCore::DedicatedWorkerThread* thread = + static_cast<WebCore::DedicatedWorkerThread*>( + current_context->workerContext()->thread()); WebCore::WorkerObjectProxy* worker_object_proxy = - ¤t_context->workerContext()->thread()->workerObjectProxy(); + &thread->workerObjectProxy(); WebWorkerImpl* impl = reinterpret_cast<WebWorkerImpl*>(worker_object_proxy); webworker = impl->client()->createWorker(proxy); } |