| Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp b/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| index 7c3a8edf639dc159de7cb3e094f92b49ced1d303..c68fa2e8b21162e0435172ae0e5ba3d541c12e4e 100644
|
| --- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| +++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| @@ -62,7 +62,7 @@ typedef WorkerThreadableWebSocketChannel::Peer Peer;
|
| // thread. signalWorkerThread() must be called before any getters are called.
|
| class ThreadableWebSocketChannelSyncHelper : public GarbageCollectedFinalized<ThreadableWebSocketChannelSyncHelper> {
|
| public:
|
| - static ThreadableWebSocketChannelSyncHelper* create(PassOwnPtr<blink::WebWaitableEvent> event)
|
| + static ThreadableWebSocketChannelSyncHelper* create(PassOwnPtr<WebWaitableEvent> event)
|
| {
|
| return new ThreadableWebSocketChannelSyncHelper(event);
|
| }
|
| @@ -97,13 +97,13 @@ public:
|
| void trace(Visitor* visitor) { }
|
|
|
| private:
|
| - explicit ThreadableWebSocketChannelSyncHelper(PassOwnPtr<blink::WebWaitableEvent> event)
|
| + explicit ThreadableWebSocketChannelSyncHelper(PassOwnPtr<WebWaitableEvent> event)
|
| : m_event(event)
|
| , m_connectRequestResult(false)
|
| {
|
| }
|
|
|
| - OwnPtr<blink::WebWaitableEvent> m_event;
|
| + OwnPtr<WebWaitableEvent> m_event;
|
| bool m_connectRequestResult;
|
| };
|
|
|
| @@ -401,7 +401,7 @@ Bridge::Bridge(ThreadableWebSocketChannelClientWrapper* workerClientWrapper, Wor
|
| : m_workerClientWrapper(workerClientWrapper)
|
| , m_workerGlobalScope(workerGlobalScope)
|
| , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
|
| - , m_syncHelper(ThreadableWebSocketChannelSyncHelper::create(adoptPtr(blink::Platform::current()->createWaitableEvent())))
|
| + , m_syncHelper(ThreadableWebSocketChannelSyncHelper::create(adoptPtr(Platform::current()->createWaitableEvent())))
|
| , m_peer(Peer::create(m_workerClientWrapper, m_loaderProxy, m_syncHelper))
|
| {
|
| ASSERT(m_workerClientWrapper.get());
|
|
|