<!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>[214073] trunk/Source/WebCore</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/214073">214073</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 15:15:58 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use an optional for didReceiveSocketStreamData's length
https://bugs.webkit.org/show_bug.cgi?id=169699
Reviewed by Brady Eidson.
Rather than sending a message with an optional length, send a message with a length
and send a different message if the receiving of bytes failed.
No new tests (no behavior change).
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::didReceiveSocketStreamData):
* Modules/websockets/WebSocketChannel.h:
* platform/network/SocketStreamHandleClient.h:
* platform/network/cf/SocketStreamHandleImplCFNet.cpp:
(WebCore::SocketStreamHandleImpl::readStreamCallback):
* platform/network/soup/SocketStreamHandleImplSoup.cpp:
(WebCore::SocketStreamHandleImpl::readBytes):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth">trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/ChangeLog 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-16 Alex Christensen <achristensen@webkit.org>
+
+ Don't use an optional for didReceiveSocketStreamData's length
+ https://bugs.webkit.org/show_bug.cgi?id=169699
+
+ Reviewed by Brady Eidson.
+
+ Rather than sending a message with an optional length, send a message with a length
+ and send a different message if the receiving of bytes failed.
+
+ No new tests (no behavior change).
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::didReceiveSocketStreamData):
+ * Modules/websockets/WebSocketChannel.h:
+ * platform/network/SocketStreamHandleClient.h:
+ * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+ (WebCore::SocketStreamHandleImpl::readStreamCallback):
+ * platform/network/soup/SocketStreamHandleImplSoup.cpp:
+ (WebCore::SocketStreamHandleImpl::readBytes):
+
</ins><span class="cx"> 2017-03-16 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Extend webkit-hyphenate-limit-lines to cover subsequent words.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -307,18 +307,15 @@
</span><span class="cx"> deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, std::optional<size_t> len)
</del><ins>+void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, size_t length)
</ins><span class="cx"> {
</span><del>- if (len)
- LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %zu bytes", this, len.value());
- else
- LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received no bytes", this);
</del><ins>+ LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %zu bytes", this, length);
</ins><span class="cx"> Ref<WebSocketChannel> protectedThis(*this); // The client can close the channel, potentially removing the last reference.
</span><span class="cx"> ASSERT(&handle == m_handle);
</span><span class="cx"> if (!m_document) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (!len || !len.value()) {
</del><ins>+ if (!length) {
</ins><span class="cx"> handle.disconnect();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -329,7 +326,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (m_shouldDiscardReceivedData)
</span><span class="cx"> return;
</span><del>- if (!appendToBuffer(data, len.value())) {
</del><ins>+ if (!appendToBuffer(data, length)) {
</ins><span class="cx"> m_shouldDiscardReceivedData = true;
</span><span class="cx"> fail("Ran out of memory while receiving WebSocket data.");
</span><span class="cx"> return;
</span><span class="lines">@@ -340,6 +337,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebSocketChannel::didFailToReceiveSocketStreamData(SocketStreamHandle& handle)
+{
+ handle.disconnect();
+}
+
</ins><span class="cx"> void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount)
</span><span class="cx"> {
</span><span class="cx"> if (m_client)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -82,7 +82,8 @@
</span><span class="cx"> // SocketStreamHandleClient functions.
</span><span class="cx"> void didOpenSocketStream(SocketStreamHandle&) final;
</span><span class="cx"> void didCloseSocketStream(SocketStreamHandle&) final;
</span><del>- void didReceiveSocketStreamData(SocketStreamHandle&, const char*, std::optional<size_t>) final;
</del><ins>+ void didReceiveSocketStreamData(SocketStreamHandle&, const char*, size_t) final;
+ void didFailToReceiveSocketStreamData(SocketStreamHandle&) final;
</ins><span class="cx"> void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) final;
</span><span class="cx"> void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void didOpenSocketStream(SocketStreamHandle&) = 0;
</span><span class="cx"> virtual void didCloseSocketStream(SocketStreamHandle&) = 0;
</span><del>- virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* data, std::optional<size_t> length) = 0;
</del><ins>+ virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* data, size_t length) = 0;
+ virtual void didFailToReceiveSocketStreamData(SocketStreamHandle&) = 0;
</ins><span class="cx"> virtual void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) = 0;
</span><span class="cx"> virtual void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) = 0;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -537,11 +537,10 @@
</span><span class="cx"> if (!length)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- std::optional<size_t> optionalLength;
- if (length != -1)
- optionalLength = length;
-
- m_client.didReceiveSocketStreamData(*this, reinterpret_cast<const char*>(ptr), optionalLength);
</del><ins>+ if (length == -1)
+ m_client.didFailToReceiveSocketStreamData(*this);
+ else
+ m_client.didReceiveSocketStreamData(*this, reinterpret_cast<const char*>(ptr), length);
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (214072 => 214073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2017-03-16 22:14:30 UTC (rev 214072)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2017-03-16 22:15:58 UTC (rev 214073)
</span><span class="lines">@@ -145,11 +145,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The client can close the handle, potentially removing the last reference.
</span><del>- RefPtr<SocketStreamHandle> protectedThis(this);
- std::optional<size_t> optionalLength;
- if (bytesRead != -1)
- optionalLength = static_cast<size_t>(bytesRead);
- m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), optionalLength);
</del><ins>+ Ref<SocketStreamHandle> protectedThis(*this);
+ if (bytesRead == -1)
+ m_client.didFailToReceiveSocketStreamData();
+ else
+ m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), static_cast<size_t>(bytesRead));
+
</ins><span class="cx"> if (m_inputStream) {
</span><span class="cx"> g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, m_cancellable.get(),
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), protectedThis.leakRef());
</span></span></pre>
</div>
</div>
</body>
</html>