Replace ASSERT*() with DCHECK*() in modules/websockets

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 85 matching lines @@
 };
 
 WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, std::unique_ptr<SourceLocation> location)
     : m_bridge(new Bridge(client, workerGlobalScope))
     , m_locationAtConnection(std::move(location))
 {
 }
 
 WorkerWebSocketChannel::~WorkerWebSocketChannel()
 {
-    ASSERT(!m_bridge);
+    DCHECK(!m_bridge);
 }
 
 bool WorkerWebSocketChannel::connect(const KURL& url, const String& protocol)
 {
-    ASSERT(m_bridge);
+    DCHECK(m_bridge);
     return m_bridge->connect(m_locationAtConnection->clone(), url, protocol);
 }
 
 void WorkerWebSocketChannel::send(const CString& message)
 {
-    ASSERT(m_bridge);
+    DCHECK(m_bridge);
     m_bridge->send(message);
 }
 
 void WorkerWebSocketChannel::send(const DOMArrayBuffer& binaryData, unsigned byteOffset, unsigned byteLength)
 {
-    ASSERT(m_bridge);
+    DCHECK(m_bridge);
     m_bridge->send(binaryData, byteOffset, byteLength);
 }
 
 void WorkerWebSocketChannel::send(PassRefPtr<BlobDataHandle> blobData)
 {
-    ASSERT(m_bridge);
+    DCHECK(m_bridge);
     m_bridge->send(std::move(blobData));
 }
 
 void WorkerWebSocketChannel::close(int code, const String& reason)
 {
-    ASSERT(m_bridge);
+    DCHECK(m_bridge);
     m_bridge->close(code, reason);
 }
 
 void WorkerWebSocketChannel::fail(const String& reason, MessageLevel level, std::unique_ptr<SourceLocation> location)
 {
     if (!m_bridge)
         return;
 
     std::unique_ptr<SourceLocation> capturedLocation = SourceLocation::capture();
     if (!capturedLocation->isUnknown()) {
@@ skipping 31 matching lines @@
     DCHECK(isMainThread());
 }
 
 Peer::~Peer()
 {
     DCHECK(isMainThread());
 }
 
 bool Peer::initialize(std::unique_ptr<SourceLocation> location, ExecutionContext* context)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (wasContextDestroyedBeforeObserverCreation())
         return false;
     Document* document = toDocument(context);
     m_mainWebSocketChannel = DocumentWebSocketChannel::create(document, this, std::move(location));
     return true;
 }
 
 bool Peer::connect(const KURL& url, const String& protocol)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (!m_mainWebSocketChannel)
         return false;
     return m_mainWebSocketChannel->connect(url, protocol);
 }
 
 void Peer::sendTextAsCharVector(std::unique_ptr<Vector<char>> data)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (m_mainWebSocketChannel)
         m_mainWebSocketChannel->sendTextAsCharVector(std::move(data));
 }
 
 void Peer::sendBinaryAsCharVector(std::unique_ptr<Vector<char>> data)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (m_mainWebSocketChannel)
         m_mainWebSocketChannel->sendBinaryAsCharVector(std::move(data));
 }
 
 void Peer::sendBlob(PassRefPtr<BlobDataHandle> blobData)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (m_mainWebSocketChannel)
         m_mainWebSocketChannel->send(std::move(blobData));
 }
 
 void Peer::close(int code, const String& reason)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (!m_mainWebSocketChannel)
         return;
     m_mainWebSocketChannel->close(code, reason);
 }
 
 void Peer::fail(const String& reason, MessageLevel level, std::unique_ptr<SourceLocation> location)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (!m_mainWebSocketChannel)
         return;
     m_mainWebSocketChannel->fail(reason, level, std::move(location));
 }
 
 void Peer::disconnect()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (!m_mainWebSocketChannel)
         return;
     m_mainWebSocketChannel->disconnect();
     m_mainWebSocketChannel = nullptr;
 }
 
 static void workerGlobalScopeDidConnect(Bridge* bridge, const String& subprotocol, const String& extensions, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);

[yhirano, 2016/09/30 01:50:30]

Is this needed?
Ditto below.

[hiroshige, 2016/09/30 06:04:24]

Oh, ALLOW_UNUSED_LOCAL() turned to be unnecessary in another codereview and I
forgot updating this CL. Removed. Done.

+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didConnect(subprotocol, extensions);
 }
 
 void Peer::didConnect(const String& subprotocol, const String& extensions)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidConnect, m_bridge, subprotocol, extensions));
 }
 
 static void workerGlobalScopeDidReceiveTextMessage(Bridge* bridge, const String& payload, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didReceiveTextMessage(payload);
 }
 
 void Peer::didReceiveTextMessage(const String& payload)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidReceiveTextMessage, m_bridge, payload));
 }
 
 static void workerGlobalScopeDidReceiveBinaryMessage(Bridge* bridge, std::unique_ptr<Vector<char>> payload, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didReceiveBinaryMessage(std::move(payload));
 }
 
 void Peer::didReceiveBinaryMessage(std::unique_ptr<Vector<char>> payload)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidReceiveBinaryMessage, m_bridge, passed(std::move(payload))));
 }
 
 static void workerGlobalScopeDidConsumeBufferedAmount(Bridge* bridge, uint64_t consumed, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didConsumeBufferedAmount(consumed);
 }
 
 void Peer::didConsumeBufferedAmount(uint64_t consumed)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidConsumeBufferedAmount, m_bridge, consumed));
 }
 
 static void workerGlobalScopeDidStartClosingHandshake(Bridge* bridge, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didStartClosingHandshake();
 }
 
 void Peer::didStartClosingHandshake()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidStartClosingHandshake, m_bridge));
 }
 
 static void workerGlobalScopeDidClose(Bridge* bridge, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didClose(closingHandshakeCompletion, code, reason);
 }
 
 void Peer::didClose(ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (m_mainWebSocketChannel) {
         m_mainWebSocketChannel->disconnect();
         m_mainWebSocketChannel = nullptr;
     }
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidClose, m_bridge, closingHandshakeCompletion, code, reason));
 }
 
 static void workerGlobalScopeDidError(Bridge* bridge, ExecutionContext* context)
 {
-    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+    ALLOW_UNUSED_LOCAL(context);
+    DCHECK(context->isWorkerGlobalScope());
     if (bridge && bridge->client())
         bridge->client()->didError();
 }
 
 void Peer::didError()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidError, m_bridge));
 }
 
 void Peer::contextDestroyed()
 {
     DCHECK(isMainThread());
     if (m_mainWebSocketChannel) {
         m_mainWebSocketChannel->disconnect();
         m_mainWebSocketChannel = nullptr;
     }
     m_bridge = nullptr;
 }
 
 DEFINE_TRACE(Peer)
 {
     visitor->trace(m_mainWebSocketChannel);
     WebSocketChannelClient::trace(visitor);
     WorkerThreadLifecycleObserver::trace(visitor);
 }
 
 Bridge::Bridge(WebSocketChannelClient* client, WorkerGlobalScope& workerGlobalScope)
     : m_client(client)
     , m_workerGlobalScope(workerGlobalScope)
     , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
 {
 }
 
 Bridge::~Bridge()
 {
-    ASSERT(!m_peer);
+    DCHECK(!m_peer);
 }
 
 void Bridge::connectOnMainThread(std::unique_ptr<SourceLocation> location, WorkerThreadLifecycleContext* workerThreadLifecycleContext, const KURL& url, const String& protocol, WebSocketChannelSyncHelper* syncHelper, ExecutionContext* context)
 {
     DCHECK(isMainThread());
     DCHECK(!m_peer);
     Peer* peer = new Peer(this, m_loaderProxy, workerThreadLifecycleContext);
     if (peer->initialize(std::move(location), context)) {
         m_peer = peer;
         syncHelper->setConnectRequestResult(m_peer->connect(url, protocol));
     }
     syncHelper->signalWorkerThread();
 }
 
 bool Bridge::connect(std::unique_ptr<SourceLocation> location, const KURL& url, const String& protocol)
 {
     // Wait for completion of the task on the main thread because the mixed
     // content check must synchronously be conducted.
     WebSocketChannelSyncHelper syncHelper;
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Bridge::connectOnMainThread, wrapCrossThreadPersistent(this), passed(location->clone()), wrapCrossThreadPersistent(m_workerGlobalScope->thread()->getWorkerThreadLifecycleContext()), url, protocol, crossThreadUnretained(&syncHelper)));
     syncHelper.wait();
     return syncHelper.connectRequestResult();
 }
 
 void Bridge::send(const CString& message)
 {
-    ASSERT(m_peer);
+    DCHECK(m_peer);
     std::unique_ptr<Vector<char>> data = wrapUnique(new Vector<char>(message.length()));
     if (message.length())
         memcpy(data->data(), static_cast<const char*>(message.data()), message.length());
 
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::sendTextAsCharVector, m_peer, passed(std::move(data))));
 }
 
 void Bridge::send(const DOMArrayBuffer& binaryData, unsigned byteOffset, unsigned byteLength)
 {
-    ASSERT(m_peer);
+    DCHECK(m_peer);
     // ArrayBuffer isn't thread-safe, hence the content of ArrayBuffer is copied into Vector<char>.
     std::unique_ptr<Vector<char>> data = wrapUnique(new Vector<char>(byteLength));
     if (binaryData.byteLength())
         memcpy(data->data(), static_cast<const char*>(binaryData.data()) + byteOffset, byteLength);
 
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::sendBinaryAsCharVector, m_peer, passed(std::move(data))));
 }
 
 void Bridge::send(PassRefPtr<BlobDataHandle> data)
 {
-    ASSERT(m_peer);
+    DCHECK(m_peer);
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::sendBlob, m_peer, std::move(data)));
 }
 
 void Bridge::close(int code, const String& reason)
 {
-    ASSERT(m_peer);
+    DCHECK(m_peer);
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::close, m_peer, code, reason));
 }
 
 void Bridge::fail(const String& reason, MessageLevel level, std::unique_ptr<SourceLocation> location)
 {
-    ASSERT(m_peer);
+    DCHECK(m_peer);
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::fail, m_peer, reason, level, passed(location->clone())));
 }
 
 void Bridge::disconnect()
 {
     if (!m_peer)
         return;
 
     m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Peer::disconnect, m_peer));
 
     m_client = nullptr;
     m_peer = nullptr;
     m_workerGlobalScope.clear();
 }
 
 DEFINE_TRACE(Bridge)
 {
     visitor->trace(m_client);
     visitor->trace(m_workerGlobalScope);
 }
 
 } // namespace blink