| Index: Source/modules/websockets/NewWebSocketChannelImpl.cpp
|
| diff --git a/Source/modules/websockets/NewWebSocketChannelImpl.cpp b/Source/modules/websockets/NewWebSocketChannelImpl.cpp
|
| index 7e415eb628edab13964eea37037e8ae45b0d3cc8..f37031843e2fc1649c352fcbf9a29564daa5b8ea 100644
|
| --- a/Source/modules/websockets/NewWebSocketChannelImpl.cpp
|
| +++ b/Source/modules/websockets/NewWebSocketChannelImpl.cpp
|
| @@ -40,6 +40,7 @@
|
| #include "modules/websockets/WebSocketChannel.h"
|
| #include "modules/websockets/WebSocketChannelClient.h"
|
| #include "platform/Logging.h"
|
| +#include "platform/NotImplemented.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebSocketHandle.h"
|
| #include "public/platform/WebString.h"
|
| @@ -359,8 +360,6 @@ void NewWebSocketChannelImpl::disconnect()
|
| {
|
| LOG(Network, "NewWebSocketChannelImpl %p disconnect()", this);
|
| abortAsyncOperations();
|
| - if (m_handle)
|
| - m_handle->close(CloseEventCodeAbnormalClosure, "");
|
| m_handle.clear();
|
| m_client = 0;
|
| }
|
| @@ -526,6 +525,12 @@ void NewWebSocketChannelImpl::didConnect(WebSocketHandle* handle, bool fail, con
|
| m_client->didConnect();
|
| }
|
|
|
| +void NewWebSocketChannelImpl::didFail(WebSocketHandle* handle, const WebKit::WebString& message)
|
| +{
|
| + LOG(Network, "NewWebSocketChannelImpl %p didFail(%p, %s)", this, handle, message.utf8().data());
|
| + notImplemented();
|
| +}
|
| +
|
| void NewWebSocketChannelImpl::didReceiveData(WebSocketHandle* handle, bool fin, WebSocketHandle::MessageType type, const char* data, size_t size)
|
| {
|
| LOG(Network, "NewWebSocketChannelImpl %p didReceiveData(%p, %d, %d, (%p, %zu))", this, handle, fin, type, data, size);
|
| @@ -570,9 +575,10 @@ void NewWebSocketChannelImpl::didReceiveData(WebSocketHandle* handle, bool fin,
|
| }
|
|
|
|
|
| -void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, unsigned short code, const WebKit::WebString& reason)
|
| +void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, bool wasClean, unsigned short code, const WebKit::WebString& reason)
|
| {
|
| - LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %u, %s)", this, handle, code, String(reason).utf8().data());
|
| + // FIXME: Use |wasClean| appropriately.
|
| + LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %d, %u, %s)", this, handle, wasClean, code, String(reason).utf8().data());
|
| ASSERT(m_handle);
|
| m_handle.clear();
|
| // FIXME: Maybe we should notify an error to m_client for some didClose messages.
|
|
|