Changeset 147618 in webkit

Timestamp:

Apr 4, 2013 3:52:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] WebSocket errors should be logged to console
​https://bugs.webkit.org/show_bug.cgi?id=113842

Patch by Seokju Kwon <Seokju Kwon> on 2013-04-04
Reviewed by Jocelyn Turcotte.

Source/WebCore:

Pass the reason of a failure to SocketStreamError instance
and notify it via SocketStreamHandleClient::didFailSocketStream().

Test : http/tests/inspector/console-websocket-error.html

• platform/network/qt/SocketStreamError.h:

(WebCore::SocketStreamError::SocketStreamError):

• platform/network/qt/SocketStreamHandleQt.cpp:

(WebCore::SocketStreamHandlePrivate::SocketStreamHandlePrivate):
(WebCore::SocketStreamHandlePrivate::socketErrorCallback):

LayoutTests:

• platform/qt/TestExpectations:
• platform/qt/http/tests/inspector/console-websocket-error-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/TestExpectations (modified) (1 diff)
• LayoutTests/platform/qt/http/tests/inspector/console-websocket-error-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/qt/SocketStreamError.h (modified) (2 diffs)
• Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-04  Seokju Kwon  <seokju.kwon@gmail.com>
+
+        [Qt] WebSocket errors should be logged to console
+        https://bugs.webkit.org/show_bug.cgi?id=113842
+
+        Reviewed by Jocelyn Turcotte.
+
+        * platform/qt/TestExpectations:
+        * platform/qt/http/tests/inspector/console-websocket-error-expected.txt: Added.
+
 2013-04-04  Ádám Kallai  <kadam@inf.u-szeged.hu>
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -2060 +2060 @@
 fast/writing-mode/vertical-baseline-alignment.html
 fast/writing-mode/vertical-font-fallback.html
-http/tests/inspector/console-websocket-error.html
 svg/as-image/animated-svg-repaints-completely-in-hidpi.html
 transitions/default-timing-function.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-04  Seokju Kwon  <seokju.kwon@gmail.com>
+
+        [Qt] WebSocket errors should be logged to console
+        https://bugs.webkit.org/show_bug.cgi?id=113842
+
+        Reviewed by Jocelyn Turcotte.
+
+        Pass the reason of a failure to SocketStreamError instance
+        and notify it via SocketStreamHandleClient::didFailSocketStream().
+
+        Test : http/tests/inspector/console-websocket-error.html
+
+        * platform/network/qt/SocketStreamError.h:
+        (WebCore::SocketStreamError::SocketStreamError):
+        * platform/network/qt/SocketStreamHandleQt.cpp:
+        (WebCore::SocketStreamHandlePrivate::SocketStreamHandlePrivate):
+        (WebCore::SocketStreamHandlePrivate::socketErrorCallback):
+
 2013-04-04  Ed Bartosh  <bartosh@gmail.com>
 

trunk/Source/WebCore/platform/network/qt/SocketStreamError.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Google Inc.  All rights reserved.
+ * Copyright (C) 2013 Seokju Kwon (seokju.kwon@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43 +44 @@
         {
         }
-
+        SocketStreamError(int errorCode, const QString& description)
+            : SocketStreamErrorBase(errorCode, String(), description)
+        {
+        }
     };
 

trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

@@ -36 +36 @@
 #include "Logging.h"
 #include "NotImplemented.h"
+#include "SocketStreamError.h"
 #include "SocketStreamHandleClient.h"
 #include "SocketStreamHandlePrivate.h"
@@ -168 +169 @@
         SocketStreamHandle* streamHandle = m_streamHandle;
         m_streamHandle = 0;
+
+        streamHandle->client()->didFailSocketStream(streamHandle, SocketStreamError(error, m_socket->errorString()));
+
         // This following call deletes _this_. Nothing should be after it.
         streamHandle->client()->didCloseSocketStream(streamHandle);