Make websocket error messages look better at the devtools console.

Source/modules/websockets/WorkerThreadableWebSocketChannel.h

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 {
 
 class KURL;
 class ScriptExecutionContext;
 class ThreadableWebSocketChannelClientWrapper;
 class WorkerContext;
 class WorkerLoaderProxy;
 class WorkerRunLoop;
 
 class WorkerThreadableWebSocketChannel : public RefCounted<WorkerThreadableWebSocketChannel>, public WebSocketChannel {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassRefPtr<WebSocketChannel> create(WorkerContext* workerContext, WebSocketChannelClient* client, const String& taskMode)
     {
         return adoptRef(new WorkerThreadableWebSocketChannel(workerContext, client, taskMode));
     }
     virtual ~WorkerThreadableWebSocketChannel();
 
     // WebSocketChannel functions.
     virtual void connect(const KURL&, const String& protocol) OVERRIDE;
     virtual String subprotocol() OVERRIDE;
     virtual String extensions() OVERRIDE;
     virtual WebSocketChannel::SendResult send(const String& message) OVERRIDE;
     virtual WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
     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;
 
     // Generated by the bridge. The Peer and its bridge should have identical
     // lifetimes.
     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)
+        // The ScriptCallFrame parameter provides the source filename and the line number information at the connection initiation,

[tkent, 2013/05/07 01:33:20]

nit: wrap the comment.

[yhirano, 2013/05/07 01:44:27]

Done.

+        // which may be shown when the connection fails.
+        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();
 
         void connect(const KURL&, const String& protocol);
         void send(const String& message);
         void send(const ArrayBuffer&);
         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();
 
         // WebSocketChannelClient functions.
         virtual void didConnect() OVERRIDE;
         virtual void didReceiveMessage(const String& message) OVERRIDE;
         virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >) OVERRIDE;
         virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;
         virtual void didStartClosingHandshake() OVERRIDE;
         virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
         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;
         RefPtr<WebSocketChannel> m_mainWebSocketChannel;
         String m_taskMode;
     };
 
     using RefCounted<WorkerThreadableWebSocketChannel>::ref;
     using RefCounted<WorkerThreadableWebSocketChannel>::deref;
 
 protected:
     // WebSocketChannel functions.
     virtual void refWebSocketChannel() OVERRIDE { ref(); }
     virtual void derefWebSocketChannel() OVERRIDE { deref(); }
 
 private:
     // Bridge for Peer. Running on the worker thread.
     class Bridge : public RefCounted<Bridge> {
     public:
         static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerContext> workerContext, const String& taskMode)
         {
             return adoptRef(new Bridge(workerClientWrapper, workerContext, taskMode));
         }
         ~Bridge();
-        void initialize();
+        // The ScriptCallFrame parameter provides the source filename and the line number information at the connection initiation,

[tkent, 2013/05/07 01:33:20]

nit: wrap the comment.

[yhirano, 2013/05/07 01:44:27]

Done.

+        // which may be shown when the connection fails.
+        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();
 
         using RefCounted<Bridge>::ref;
         using RefCounted<Bridge>::deref;
 
     private:
         Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode);
 
         static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
 
         // Executed on the main thread to create a Peer for this bridge.
-        static void mainThreadInitialize(ScriptExecutionContext*, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode);
+        // sourceURL and lineNumber provides the source filename and the line number information at the connection initiation respectively.

[tkent, 2013/05/07 01:33:20]

nit: wrap the comment.

[yhirano, 2013/05/07 01:44:27]

Done.

+        // They may be shown when the connection fails.
+        static void mainThreadInitialize(ScriptExecutionContext*, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const String& sourceURL, unsigned lineNumber);
 
         // Executed on the worker context's thread.
         void clearClientWrapper();
 
         void setMethodNotCompleted();
         void waitForMethodCompletion();
 
         RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
         RefPtr<WorkerContext> m_workerContext;
         WorkerLoaderProxy& m_loaderProxy;
         String m_taskMode;
         Peer* m_peer;
     };
 
     WorkerThreadableWebSocketChannel(WorkerContext*, WebSocketChannelClient*, const String& taskMode);
 
     static void mainThreadConnect(ScriptExecutionContext*, Peer*, const KURL&, const String& protocol);
     static void mainThreadSend(ScriptExecutionContext*, Peer*, const String& message);
     static void mainThreadSendArrayBuffer(ScriptExecutionContext*, Peer*, PassOwnPtr<Vector<char> >);
     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*);
 
     class WorkerContextDidInitializeTask;
 
     RefPtr<WorkerContext> m_workerContext;
     RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
     RefPtr<Bridge> m_bridge;
+    ScriptCallFrame m_callFrameAtConnection;
 };
 
 } // namespace WebCore
 
 #endif // WorkerThreadableWebSocketChannel_h