Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1064)

Unified Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

Issue 1456463002: [WebSocket] Remove release assertions that are no longer needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
index 0a61dcfcc5296074964d16e2ec7241b05a065820..f68c76779941577de2f63eb62323949d601ffe41 100644
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
@@ -234,9 +234,7 @@ DOMWebSocket::DOMWebSocket(ExecutionContext* context)
DOMWebSocket::~DOMWebSocket()
{
- WebSocketChannel* channel = m_channel;
- // TODO(yhirano): Use ASSERT instead when crbug.com/550632 is fixed.
- RELEASE_ASSERT(!channel);
+ ASSERT(!m_channel);
}
void DOMWebSocket::logError(const String& message)
@@ -573,8 +571,7 @@ ExecutionContext* DOMWebSocket::executionContext() const
void DOMWebSocket::contextDestroyed()
{
WTF_LOG(Network, "WebSocket %p contextDestroyed()", this);
- // TODO(yhirano): Use ASSERT instead when crbug.com/550632 is fixed.
- RELEASE_ASSERT(!m_channel);
+ ASSERT(!m_channel);
ASSERT(m_state == CLOSED);
ActiveDOMObject::contextDestroyed();
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698