From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Feb 2012 09:55:33 +0100 Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560) --- Source/WebCore/websockets/WebSocketChannel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/websockets/WebSocketChannel.cpp') diff --git a/Source/WebCore/websockets/WebSocketChannel.cpp b/Source/WebCore/websockets/WebSocketChannel.cpp index f052f57e4..53436e39a 100644 --- a/Source/WebCore/websockets/WebSocketChannel.cpp +++ b/Source/WebCore/websockets/WebSocketChannel.cpp @@ -218,7 +218,7 @@ void WebSocketChannel::fail(const String& reason) LOG(Network, "WebSocketChannel %p fail: %s", this, reason.utf8().data()); ASSERT(!m_suspended); if (m_context) - m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, reason, 0, m_handshake->clientOrigin(), 0); + m_context->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, reason, m_handshake->clientOrigin()); if (!m_useHixie76Protocol) { // Hybi-10 specification explicitly states we must not continue to handle incoming data // once the WebSocket connection is failed (section 7.1.7). @@ -347,7 +347,7 @@ void WebSocketChannel::didFailSocketStream(SocketStreamHandle* handle, const Soc ASSERT(failingURL.isNull() || m_handshake->url().string() == failingURL); if (failingURL.isNull()) failingURL = m_handshake->url().string(); - m_context->addMessage(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message, 0, failingURL, 0); + m_context->addConsoleMessage(NetworkMessageSource, LogMessageType, ErrorMessageLevel, message, failingURL); } m_shouldDiscardReceivedData = true; handle->disconnect(); -- cgit v1.2.1