| Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp b/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| index 7d89c3acfdf7cf9a0291f7ef4f5b2dae4d8ef274..20969357ba20bb9654d24887eed279580fac6f46 100644
|
| --- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| +++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp
|
| @@ -222,7 +222,7 @@ void WorkerThreadableWebSocketChannel::resume()
|
| WorkerThreadableWebSocketChannel::Peer::Peer(PassRefPtr<WeakReference<Peer> > reference, PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ExecutionContext* context, const String& sourceURL, unsigned lineNumber, PassOwnPtr<ThreadableWebSocketChannelSyncHelper> syncHelper)
|
| : m_workerClientWrapper(clientWrapper)
|
| , m_loaderProxy(loaderProxy)
|
| - , m_mainWebSocketChannel(0)
|
| + , m_mainWebSocketChannel(nullptr)
|
| , m_syncHelper(syncHelper)
|
| , m_weakFactory(reference, this)
|
| {
|
| @@ -335,7 +335,7 @@ void WorkerThreadableWebSocketChannel::Peer::disconnect()
|
| if (!m_mainWebSocketChannel)
|
| return;
|
| m_mainWebSocketChannel->disconnect();
|
| - m_mainWebSocketChannel = 0;
|
| + m_mainWebSocketChannel = nullptr;
|
| }
|
|
|
| void WorkerThreadableWebSocketChannel::Peer::suspend()
|
| @@ -425,7 +425,7 @@ static void workerGlobalScopeDidClose(ExecutionContext* context, PassRefPtr<Thre
|
| void WorkerThreadableWebSocketChannel::Peer::didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
|
| {
|
| ASSERT(isMainThread());
|
| - m_mainWebSocketChannel = 0;
|
| + m_mainWebSocketChannel = nullptr;
|
| m_loaderProxy.postTaskToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reason));
|
| }
|
|
|
| @@ -576,7 +576,7 @@ bool WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion()
|
| void WorkerThreadableWebSocketChannel::Bridge::terminatePeer()
|
| {
|
| m_loaderProxy.postTaskToLoader(CallClosureTask::create(bind(&Peer::destroy, m_peer)));
|
| - m_workerGlobalScope = 0;
|
| + m_workerGlobalScope = nullptr;
|
| m_syncHelper = 0;
|
| }
|
|
|
|
|