Make websocket error messages look better at the devtools console.

Source/modules/websockets/WebSocketChannel.h

 /*
  * Copyright (C) 2009 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 WebSocketChannel_h
 #define WebSocketChannel_h
 
+#include "core/inspector/ScriptCallFrame.h"
+#include "core/inspector/ScriptCallStack.h"
+#include "core/page/ConsoleTypes.h"
 #include "wtf/Forward.h"
 #include "wtf/Noncopyable.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
+#include "wtf/Vector.h"
 
 namespace WebCore {
 
 class Blob;
 class KURL;
 class ScriptExecutionContext;
 class WebSocketChannelClient;
 
 class WebSocketChannel {
     WTF_MAKE_NONCOPYABLE(WebSocketChannel);
@@ skipping 19 matching lines @@
         CloseEventCodeInvalidFramePayloadData = 1007,
         CloseEventCodePolicyViolation = 1008,
         CloseEventCodeMessageTooBig = 1009,
         CloseEventCodeMandatoryExt = 1010,
         CloseEventCodeInternalError = 1011,
         CloseEventCodeTLSHandshake = 1015,
         CloseEventCodeMinimumUserDefined = 3000,
         CloseEventCodeMaximumUserDefined = 4999
     };
 
+    // A holder class for Vector<ScriptCallFrame> for readability.
+    class CallStackWrapper {
+    public:
+        CallStackWrapper(const Vector<ScriptCallFrame>& frames): m_frames(frames) { }
+        PassRefPtr<ScriptCallStack> createCallStack() { return ScriptCallStack::create(m_frames); }
+
+    private:
+        Vector<ScriptCallFrame> m_frames;
+    };
+
     virtual void connect(const KURL&, const String& protocol) = 0;
     virtual String subprotocol() = 0; // Will be available after didConnect() callback is invoked.
     virtual String extensions() = 0; // Will be available after didConnect() callback is invoked.
     virtual SendResult send(const String& message) = 0;
     virtual SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) = 0;
     virtual SendResult send(const Blob&) = 0;
     virtual unsigned long bufferedAmount() const = 0;
     virtual void close(int code, const String& reason) = 0;
+
     // Log the reason text and close the connection. Will call didClose().
-    virtual void fail(const String& reason) = 0;
+    // The MessageLevel parameter will be used for the level of the message shown at the devtool console.

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

nit: wrap the comment

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

Done.

+    // The CallStackWrapper parameter is callstack information. it may be shown with the reason text at the devtool console.
+    // If the parameter is null, the instance may fill the callstack information and show it with the reason text if possible.
+    virtual void fail(const String& reason, MessageLevel, PassOwnPtr<CallStackWrapper>) = 0;
+
+    // Log the reason text and close the connection. Will call didClose().
+    // The MessageLevel parameter will be used for the level of the message shown at the devtool console.

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

nit: wrap the comment

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

Done.

+    // The instance may fill the callstack information and show it with the reason text if possible.
+    virtual void fail(const String& reason, MessageLevel) = 0;
+
     virtual void disconnect() = 0; // Will suppress didClose().
 
     virtual void suspend() = 0;
     virtual void resume() = 0;
 
     void ref() { refWebSocketChannel(); }
     void deref() { derefWebSocketChannel(); }
 
 protected:
     virtual ~WebSocketChannel() { }
     virtual void refWebSocketChannel() = 0;
     virtual void derefWebSocketChannel() = 0;
 };
 
 } // namespace WebCore
 
 #endif // WebSocketChannel_h