Chromium Code Reviews| Index: Source/modules/websockets/WebSocket.cpp |
| diff --git a/Source/modules/websockets/WebSocket.cpp b/Source/modules/websockets/WebSocket.cpp |
| index d9521189d1f1cc283f7ed38d28e4e125ee4bd939..98dd8265316e015b102238385ffc7256ac2d7d2a 100644 |
| --- a/Source/modules/websockets/WebSocket.cpp |
| +++ b/Source/modules/websockets/WebSocket.cpp |
| @@ -489,14 +489,15 @@ void WebSocket::resume() |
| void WebSocket::stop() |
| { |
| - bool pending = hasPendingActivity(); |
| - if (m_channel) |
| + if (!hasPendingActivity()) |
|
tyoshino (SeeGerritForStatus)
2013/06/10 04:41:49
could you please insert
ASSERT(!m_channel);
here?
vivekg_samsung
2013/06/10 06:29:46
Yeah I will add it, thank you!
How about also add
tyoshino (SeeGerritForStatus)
2013/06/10 08:49:46
Sounds good. Please :)
|
| + return; |
| + if (m_channel) { |
| m_channel->disconnect(); |
| - m_channel = 0; |
| + m_channel = 0; |
| + } |
| m_state = CLOSED; |
| ActiveDOMObject::stop(); |
| - if (pending) |
| - ActiveDOMObject::unsetPendingActivity(this); |
| + ActiveDOMObject::unsetPendingActivity(this); |
| } |
| void WebSocket::didConnect() |