Chromium Code Reviews| Index: Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp |
| diff --git a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp |
| index 59e4181abf0addfec01b09129ab119e30e6be980..8cde1598640efb1dec27efd8077317b7632e8b2b 100644 |
| --- a/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp |
| +++ b/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp |
| @@ -29,6 +29,7 @@ |
| */ |
| #include "config.h" |
| +#include "SocketStreamError.h" |
| #include "SocketStreamHandle.h" |
| #include "SocketStreamHandleInternal.h" |
| @@ -37,6 +38,7 @@ |
| #include "SocketStreamHandleClient.h" |
| #include <public/Platform.h> |
| #include <public/WebData.h> |
| +#include <public/WebSocketStreamError.h> |
| #include <public/WebSocketStreamHandle.h> |
| #include <wtf/PassOwnPtr.h> |
| @@ -153,11 +155,8 @@ void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHa |
| LOG(Network, "SocketStreamHandleInternal %p didFail()", this); |
| if (m_handle && m_socket) { |
| ASSERT(socketHandle == m_socket.get()); |
| - m_socket.clear(); |
| - SocketStreamHandle* h = m_handle; |
| - m_handle = 0; |
| - if (h->m_client) |
| - h->m_client->didCloseSocketStream(h); // didFail(h, err); |
| + if (m_handle->m_client) |
| + m_handle->m_client->didFailSocketStream(m_handle, *(PassRefPtr<SocketStreamError>(err))); |
|
tyoshino (SeeGerritForStatus)
2013/04/17 13:50:10
i'm not 100% sure if we can choose not to do the s
Li Yin
2013/04/18 07:03:03
didClose will be always invoked at the end. So cle
tyoshino (SeeGerritForStatus)
2013/04/18 08:29:59
I was trying to remember why m_handle is set to 0
|
| } |
| } |