Source/modules/websockets/WorkerThreadableWebSocketChannel.h - Issue 14657008: Make websocket error messages look better at the devtools console.

Unified Diff: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

Issue 14657008: Make websocket error messages look better at the devtools console. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: cleanup 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

« Source/modules/websockets/WebSocket.cpp ('K') | « Source/modules/websockets/WebSocketChannel.h ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('j') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

index c0b3079dc7e352cff4bb56ed6a81bc79b0b66edf..795079647ff0d97f97a67b28ce4b3ebf089eac12 100644

--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

+++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h

@@ -31,14 +31,18 @@

#ifndef WorkerThreadableWebSocketChannel_h

#define WorkerThreadableWebSocketChannel_h

+#include "core/inspector/ScriptCallFrame.h"

+#include "core/page/ConsoleTypes.h"

#include "core/workers/WorkerContext.h"

#include "modules/websockets/WebSocketChannel.h"

#include "modules/websockets/WebSocketChannelClient.h"

+#include "wtf/PassOwnPtr.h"

#include "wtf/PassRefPtr.h"

#include "wtf/RefCounted.h"

#include "wtf/RefPtr.h"

#include "wtf/Threading.h"

+#include "wtf/Vector.h"

#include "wtf/text/WTFString.h"

namespace WebCore {

@@ -68,7 +72,8 @@ public:

virtual WebSocketChannel::SendResult send(const Blob&) OVERRIDE;

virtual unsigned long bufferedAmount() const OVERRIDE;

virtual void close(int code, const String& reason) OVERRIDE;

- virtual void fail(const String& reason) OVERRIDE;

+ virtual void fail(const String& reason, MessageLevel) OVERRIDE;

+ virtual void fail(const String& reason, MessageLevel, PassOwnPtr<CallStackWrapper>) OVERRIDE;

virtual void disconnect() OVERRIDE; // Will suppress didClose().

virtual void suspend() OVERRIDE;

virtual void resume() OVERRIDE;

@@ -78,9 +83,9 @@ public:

class Peer : public WebSocketChannelClient {

WTF_MAKE_NONCOPYABLE(Peer); WTF_MAKE_FAST_ALLOCATED;

public:

- static Peer* create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode)

+ static Peer* create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const ScriptCallFrame& frame)

{

- return new Peer(clientWrapper, loaderProxy, context, taskMode);

+ return new Peer(clientWrapper, loaderProxy, context, taskMode, frame);

}

~Peer();

@@ -90,7 +95,7 @@ public:

void send(const Blob&);

void bufferedAmount();

void close(int code, const String& reason);

- void fail(const String& reason);

+ void fail(const String& reason, MessageLevel, PassOwnPtr<CallStackWrapper>);

void disconnect();

void suspend();

void resume();

@@ -105,7 +110,7 @@ public:

virtual void didReceiveMessageError() OVERRIDE;

private:

- Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode);

+ Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const ScriptCallFrame&);

RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;

WorkerLoaderProxy& m_loaderProxy;

@@ -130,14 +135,14 @@ private:

return adoptRef(new Bridge(workerClientWrapper, workerContext, taskMode));

}

~Bridge();

tyoshino (SeeGerritForStatus) 2013/05/01 08:03:23 Explain what the ScriptCallFrame argument is expec

yhirano 2013/05/01 09:31:44 Done.

- void initialize();

+ void initialize(const ScriptCallFrame&);

void connect(const KURL&, const String& protocol);

WebSocketChannel::SendResult send(const String& message);

WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength);

WebSocketChannel::SendResult send(const Blob&);

unsigned long bufferedAmount();

void close(int code, const String& reason);

- void fail(const String& reason);

+ void fail(const String& reason, MessageLevel, PassOwnPtr<CallStackWrapper>);

void disconnect();

void suspend();

void resume();

@@ -151,7 +156,7 @@ private:

static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);

// Executed on the main thread to create a Peer for this bridge.

tyoshino (SeeGerritForStatus) 2013/05/01 08:03:23 Explain how sourceURL and lineNumber will be used

yhirano 2013/05/01 09:31:44 Done.

- static void mainThreadInitialize(ScriptExecutionContext*, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode);

+ static void mainThreadInitialize(ScriptExecutionContext*, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const String& sourceURL, unsigned lineNumber);

// Executed on the worker context's thread.

void clearClientWrapper();

@@ -174,7 +179,7 @@ private:

static void mainThreadSendBlob(ScriptExecutionContext*, Peer*, const KURL&, const String& type, long long size);

static void mainThreadBufferedAmount(ScriptExecutionContext*, Peer*);

static void mainThreadClose(ScriptExecutionContext*, Peer*, int code, const String& reason);

- static void mainThreadFail(ScriptExecutionContext*, Peer*, const String& reason);

+ static void mainThreadFail(ScriptExecutionContext*, Peer*, const String& reason, MessageLevel, PassOwnPtr<CallStackWrapper>);

static void mainThreadDestroy(ScriptExecutionContext*, PassOwnPtr<Peer>);

static void mainThreadSuspend(ScriptExecutionContext*, Peer*);

static void mainThreadResume(ScriptExecutionContext*, Peer*);

@@ -184,6 +189,7 @@ private:

RefPtr<WorkerContext> m_workerContext;

RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;

RefPtr<Bridge> m_bridge;

+ ScriptCallFrame m_callFrameAtConnection;

};

} // namespace WebCore