Title: [100891] trunk
- Revision
- 100891
- Author
- [email protected]
- Date
- 2011-11-21 01:42:57 -0800 (Mon, 21 Nov 2011)
Log Message
[Qt] WebSocket close tests are failing
https://bugs.webkit.org/show_bug.cgi?id=72865
Reviewed by Simon Hausmann.
Source/WebCore:
* platform/network/qt/SocketStreamHandleQt.cpp:
(WebCore::SocketStreamHandlePrivate::close):
Emit didCloseSocketStream() callback even before the connection is established.
Call m_socket->abort() to prevent "connected" signal from firing.
LayoutTests:
* platform/qt/Skipped:
Unskip five WebSocket tests. Remove "failing websocket tests" section,
as there are no tests in this section.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (100890 => 100891)
--- trunk/LayoutTests/ChangeLog 2011-11-21 09:20:57 UTC (rev 100890)
+++ trunk/LayoutTests/ChangeLog 2011-11-21 09:42:57 UTC (rev 100891)
@@ -1,3 +1,14 @@
+2011-11-21 Yuta Kitamura <[email protected]>
+
+ [Qt] WebSocket close tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=72865
+
+ Reviewed by Simon Hausmann.
+
+ * platform/qt/Skipped:
+ Unskip five WebSocket tests. Remove "failing websocket tests" section,
+ as there are no tests in this section.
+
2011-11-20 Shinya Kawanaka <[email protected]>
[Chromium] Layout test does not return correct misspelling positions if there are multiple misspelled words.
Modified: trunk/LayoutTests/platform/qt/Skipped (100890 => 100891)
--- trunk/LayoutTests/platform/qt/Skipped 2011-11-21 09:20:57 UTC (rev 100890)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-11-21 09:42:57 UTC (rev 100891)
@@ -44,7 +44,6 @@
# - Failed canvas tests from http://philip.html5.org/tests/canvas/suite/tests/
# - failing transforms tests
# - failing printing tests
-# - failing websocket tests
# - new tests without expected results
# - Qt 4.7 related bugs
# - Qt 4.8 related bugs
@@ -1602,17 +1601,6 @@
printing/media-queries-print.html
# ============================================================================= #
-# failing websocket tests
-# ============================================================================= #
-
-# SocketStreamHandleQt seems to have some bug in platformClose() behavior.
-http/tests/websocket/tests/hybi/close-before-open.html
-http/tests/websocket/tests/hybi/close-code-and-reason.html
-http/tests/websocket/tests/hybi/close.html
-http/tests/websocket/tests/hybi/workers/close.html
-http/tests/websocket/tests/hybi/workers/close-code-and-reason.html
-
-# ============================================================================= #
# new tests without expected results
# ============================================================================= #
editing/selection/transformed-selection-rects.html
Modified: trunk/Source/WebCore/ChangeLog (100890 => 100891)
--- trunk/Source/WebCore/ChangeLog 2011-11-21 09:20:57 UTC (rev 100890)
+++ trunk/Source/WebCore/ChangeLog 2011-11-21 09:42:57 UTC (rev 100891)
@@ -1,3 +1,15 @@
+2011-11-21 Yuta Kitamura <[email protected]>
+
+ [Qt] WebSocket close tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=72865
+
+ Reviewed by Simon Hausmann.
+
+ * platform/network/qt/SocketStreamHandleQt.cpp:
+ (WebCore::SocketStreamHandlePrivate::close):
+ Emit didCloseSocketStream() callback even before the connection is established.
+ Call m_socket->abort() to prevent "connected" signal from firing.
+
2011-11-21 Shinya Kawanaka <[email protected]>
Refactoring: SpellChecker::requestCheckingFor should take Range instead of Node.
Modified: trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp (100890 => 100891)
--- trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp 2011-11-21 09:20:57 UTC (rev 100890)
+++ trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp 2011-11-21 09:42:57 UTC (rev 100891)
@@ -106,6 +106,11 @@
void SocketStreamHandlePrivate::close()
{
+ if (m_streamHandle->m_state == SocketStreamHandleBase::Connecting) {
+ m_socket->abort();
+ m_streamHandle->client()->didCloseSocketStream(m_streamHandle);
+ return;
+ }
if (m_socket && m_socket->state() == QAbstractSocket::ConnectedState)
m_socket->close();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
