Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: Source/modules/websockets/MainThreadWebSocketChannel.cpp

Issue 14320014: Make the WebSocket fail messages meaningful (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix a test expectation 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/modules/websockets/MainThreadWebSocketChannel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/MainThreadWebSocketChannel.cpp
diff --git a/Source/modules/websockets/MainThreadWebSocketChannel.cpp b/Source/modules/websockets/MainThreadWebSocketChannel.cpp
index af8d499a7c056fae3631c18edef8418b340a52ba..6fabcf8716896e5f79b39a012215ef263eb85deb 100644
--- a/Source/modules/websockets/MainThreadWebSocketChannel.cpp
+++ b/Source/modules/websockets/MainThreadWebSocketChannel.cpp
@@ -32,6 +32,7 @@
#include "modules/websockets/MainThreadWebSocketChannel.h"
+#include "bindings/v8/ScriptCallStackFactory.h"
#include "core/dom/Document.h"
#include "core/dom/ExceptionCodePlaceholder.h"
#include "core/dom/ScriptExecutionContext.h"
@@ -87,6 +88,7 @@ MainThreadWebSocketChannel::MainThreadWebSocketChannel(Document* document, WebSo
, m_closeEventCode(CloseEventCodeAbnormalClosure)
, m_outgoingFrameQueueStatus(OutgoingFrameQueueOpen)
, m_blobLoaderStatus(BlobLoaderNotStarted)
+ , m_callFrameAtConnection("", "", 0)
{
if (Page* page = m_document->page())
m_identifier = createUniqueIdentifier();
@@ -108,6 +110,8 @@ void MainThreadWebSocketChannel::connect(const KURL& url, const String& protocol
InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url, m_document->url(), protocol);
ref();
m_handle = SocketStreamHandle::create(m_handshake->url(), this);
+ RefPtr<ScriptCallStack> callstack = createScriptCallStack(1, true);
+ m_callFrameAtConnection = callstack && callstack->size() > 0 ? callstack->at(0) : ScriptCallFrame("", "", 0);
}
String MainThreadWebSocketChannel::subprotocol()
@@ -196,7 +200,19 @@ void MainThreadWebSocketChannel::fail(const String& reason)
ASSERT(!m_suspended);
if (m_document) {
InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, reason);
- m_document->addConsoleMessage(NetworkMessageSource, ErrorMessageLevel, "WebSocket connection to '" + m_handshake->url().elidedString() + "' failed: " + reason);
+ const String message = "WebSocket connection to '" + m_handshake->url().elidedString() + "' failed: " + reason;
+ RefPtr<ScriptCallStack> callstack = createScriptCallStack(1, true);
+ if (callstack && callstack->size() > 0) {
+ // We are in a JS callstack.
+ // So, the addConsoleMessage method will show the stack appropriately.
+ m_document->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
+ } else {
+ // We are not in a JS callstack.
+ // Then show the source file and the line number at the connection initiation.
+ const String& url = m_callFrameAtConnection.sourceURL();
+ unsigned lineNumber = m_callFrameAtConnection.lineNumber();
+ static_cast<ScriptExecutionContext*>(m_document)->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message, url, lineNumber, 0, 0);
+ }
}
// Hybi-10 specification explicitly states we must not continue to handle incoming data
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698