Source/core/platform/network/chromium/SocketStreamHandle.cpp - Issue 14071008: WebSocket object should fire error event when WebSocket server can't be connected.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/platform/network/chromium/SocketStreamHandle.cpp

Issue 14071008: WebSocket object should fire error event when WebSocket server can't be connected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: Add new layouttests into TestExceptions because it depends on chromium side patch Created 7 years, 8 months 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 | « Source/core/platform/network/chromium/SocketStreamError.h ('k') | Source/modules/websockets/MainThreadWebSocketChannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/network/chromium/SocketStreamHandle.cpp

diff --git a/Source/core/platform/network/chromium/SocketStreamHandle.cpp b/Source/core/platform/network/chromium/SocketStreamHandle.cpp

index 71c182dd914575698063d9502654529f424de2ae..fe99196cdfa58b26af545f57f9a99a3b6db5a3cb 100644

--- a/Source/core/platform/network/chromium/SocketStreamHandle.cpp

+++ b/Source/core/platform/network/chromium/SocketStreamHandle.cpp

@@ -34,9 +34,11 @@

#include "Logging.h"

#include "NotImplemented.h"

+#include "SocketStreamError.h"

#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)));

}