<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173642] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173642">173642</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-15 17:45:04 -0700 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Core: Websocket state should be set to closed in didReceiveMessage call back.
https://bugs.webkit.org/show_bug.cgi?id=136219
Patch by Shivakumar JM <shiva.jm@samsung.com> on 2014-09-15
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Set the Websocket state to closed in didReceiveMessage call back.
Test: http/tests/websocket/tests/hybi/error-event-ready-state.html
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::didReceiveMessageError):
LayoutTests:
Added test to check readyState is CLOSED within onerror event.
* http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt: Added.
* http/tests/websocket/tests/hybi/error-event-ready-state.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestswebsockettestshybierroreventreadystateexpectedtxt">trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestswebsockettestshybierroreventreadystatehtml">trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173641 => 173642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-16 00:44:16 UTC (rev 173641)
+++ trunk/LayoutTests/ChangeLog 2014-09-16 00:45:04 UTC (rev 173642)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-15 Shivakumar JM <shiva.jm@samsung.com>
+
+ Web Core: Websocket state should be set to closed in didReceiveMessage call back.
+ https://bugs.webkit.org/show_bug.cgi?id=136219
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added test to check readyState is CLOSED within onerror event.
+
+ * http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt: Added.
+ * http/tests/websocket/tests/hybi/error-event-ready-state.html: Added.
+
</ins><span class="cx"> 2014-09-15 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Windows rebaselining to account for subpixel layout Part 1.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestswebsockettestshybierroreventreadystateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt (0 => 173642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt 2014-09-16 00:45:04 UTC (rev 173642)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+CONSOLE MESSAGE: WebSocket connection to 'ws://localhost:8880/non-existent-url' failed: Unexpected response code: 404
+Test that readyState is CLOSED within onerror event
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+onerror() was called.
+PASS ws.readyState is 3
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestswebsockettestshybierroreventreadystatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state.html (0 => 173642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state.html (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state.html 2014-09-16 00:45:04 UTC (rev 173642)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../../../js-test-resources/js-test.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<script type="text/javascript">
+description("Test that readyState is CLOSED within onerror event");
+
+window.jsTestIsAsync = true;
+
+var ws = new WebSocket("ws://localhost:8880/non-existent-url");
+
+ws.onerror = function(event) {
+ debug("onerror() was called.");
+ shouldBe("ws.readyState", "3");
+ finishJSTest();
+};
+
+</script>
+<script src="../../../../js-test-resources/js-test.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173641 => 173642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-16 00:44:16 UTC (rev 173641)
+++ trunk/Source/WebCore/ChangeLog 2014-09-16 00:45:04 UTC (rev 173642)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-09-15 Shivakumar JM <shiva.jm@samsung.com>
+
+ Web Core: Websocket state should be set to closed in didReceiveMessage call back.
+ https://bugs.webkit.org/show_bug.cgi?id=136219
+
+ Reviewed by Alexey Proskuryakov.
+
+ Set the Websocket state to closed in didReceiveMessage call back.
+
+ Test: http/tests/websocket/tests/hybi/error-event-ready-state.html
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::didReceiveMessageError):
+
</ins><span class="cx"> 2014-09-15 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Naming clean-up.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (173641 => 173642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-09-16 00:44:16 UTC (rev 173641)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-09-16 00:45:04 UTC (rev 173642)
</span><span class="lines">@@ -533,6 +533,7 @@
</span><span class="cx"> void WebSocket::didReceiveMessageError()
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocket %p didReceiveErrorMessage()", this);
</span><ins>+ m_state = CLOSED;
</ins><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>