| Index: third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
|
| diff --git a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
|
| index bd1bfe3244dc35d5e0f9a039abaa4e2dc25a98e9..c356a501e3eb14c7101603bbffe05dd349a339c7 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
|
| +++ b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
|
| @@ -39,7 +39,7 @@
|
| #include "core/fileapi/Blob.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/WaitableEvent.h"
|
| #include "platform/heap/SafePoint.h"
|
| @@ -372,7 +372,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->workerScript()->workerLoaderProxy())
|
| , m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(new WaitableEvent())))
|
| , m_peer(new Peer(this, m_loaderProxy, m_syncHelper))
|
| {
|
| @@ -470,7 +470,7 @@ bool Bridge::waitForMethodCompletion(PassOwnPtr<ExecutionContextTask> task)
|
| SafePointScope scope(BlinkGC::HeapPointersOnStack);
|
| m_syncHelper->wait();
|
| // This is checking whether a shutdown event is fired or not.
|
| - return !m_workerGlobalScope->thread()->terminated();
|
| + return !m_workerGlobalScope->workerScript()->terminated();
|
| }
|
|
|
| DEFINE_TRACE(Bridge)
|
|
|