Index: Source/modules/websockets/WorkerWebSocketChannel.cpp |
diff --git a/Source/modules/websockets/WorkerWebSocketChannel.cpp b/Source/modules/websockets/WorkerWebSocketChannel.cpp |
index 8827984eaa7614858593f2c556cad79fff0a4f19..c65535077a4a762ce2000461a141c86d270aa844 100644 |
--- a/Source/modules/websockets/WorkerWebSocketChannel.cpp |
+++ b/Source/modules/websockets/WorkerWebSocketChannel.cpp |
@@ -42,7 +42,7 @@ |
#include "core/inspector/ScriptCallStack.h" |
#include "core/workers/WorkerGlobalScope.h" |
#include "core/workers/WorkerLoaderProxy.h" |
-#include "core/workers/WorkerThread.h" |
+#include "core/workers/WorkerScript.h" |
#include "modules/websockets/DocumentWebSocketChannel.h" |
#include "platform/heap/SafePoint.h" |
#include "public/platform/Platform.h" |
@@ -375,7 +375,7 @@ DEFINE_TRACE(Peer) |
Bridge::Bridge(WebSocketChannelClient* client, WorkerGlobalScope& workerGlobalScope) |
: m_client(client) |
, m_workerGlobalScope(workerGlobalScope) |
- , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy()) |
+ , m_loaderProxy(m_workerGlobalScope->script()->workerLoaderProxy()) |
, m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(Platform::current()->createWaitableEvent()))) |
, m_peer(new Peer(this, m_loaderProxy, m_syncHelper)) |
{ |
@@ -473,7 +473,7 @@ bool Bridge::waitForMethodCompletion(PassOwnPtr<ExecutionContextTask> task) |
SafePointScope scope(ThreadState::HeapPointersOnStack); |
m_syncHelper->wait(); |
// This is checking whether a shutdown event is fired or not. |
- return !m_workerGlobalScope->thread()->terminated(); |
+ return !m_workerGlobalScope->script()->terminated(); |
} |
DEFINE_TRACE(Bridge) |