<!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>[204512] trunk/Source</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/204512">204512</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-08-16 10:14:42 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up WebSockets
https://bugs.webkit.org/show_bug.cgi?id=160889
Reviewed by Darin Adler.
Source/WebCore:
We should use size_t's instead of ints for data lengths.
SocketStreamHandleClient is now purely virtual.
A few places that will need SocketStreamHandleImpls instead of SocketStreamHandles now have them.
This patch doesn't change behavior.
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::didCloseSocketStream):
(WebCore::WebSocketChannel::didReceiveSocketStreamData):
* Modules/websockets/WebSocketChannel.h:
* platform/network/SocketStreamHandle.cpp:
(WebCore::SocketStreamHandle::state):
(WebCore::SocketStreamHandle::send):
* platform/network/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::bufferedAmount):
(WebCore::SocketStreamHandle::client): Deleted.
* platform/network/SocketStreamHandleClient.h:
(WebCore::SocketStreamHandleClient::~SocketStreamHandleClient):
(WebCore::SocketStreamHandleClient::didOpenSocketStream): Deleted.
(WebCore::SocketStreamHandleClient::didCloseSocketStream): Deleted.
(WebCore::SocketStreamHandleClient::didReceiveSocketStreamData): Deleted.
(WebCore::SocketStreamHandleClient::didUpdateBufferedAmount): Deleted.
(WebCore::SocketStreamHandleClient::didFailSocketStream): Deleted.
* platform/network/cf/SocketStreamHandleImpl.h:
(WebCore::SocketStreamHandleImpl::create):
* platform/network/cf/SocketStreamHandleImplCFNet.cpp:
(WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::platformSend):
(WebCore::SocketStreamHandleImpl::platformClose):
* platform/network/curl/SocketStreamHandleImpl.h:
(WebCore::SocketStreamHandleImpl::create):
* platform/network/soup/SocketStreamHandleImpl.h:
* platform/network/soup/SocketStreamHandleImplSoup.cpp:
(WebCore::SocketStreamHandleImpl::create):
Source/WebKit2:
* UIProcess/InspectorServer/WebSocketServerConnection.cpp:
(WebKit::WebSocketServerConnection::didCloseSocketStream):
(WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
* UIProcess/InspectorServer/WebSocketServerConnection.h:</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="#trunkSourceWebCoreplatformnetworkSocketStreamHandlecpp">trunk/Source/WebCore/platform/network/SocketStreamHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleh">trunk/Source/WebCore/platform/network/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth">trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplCurlcpp">trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectioncpp">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectionh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-08-16 Alex Christensen <achristensen@webkit.org>
+
+ Clean up WebSockets
+ https://bugs.webkit.org/show_bug.cgi?id=160889
+
+ Reviewed by Darin Adler.
+
+ We should use size_t's instead of ints for data lengths.
+ SocketStreamHandleClient is now purely virtual.
+ A few places that will need SocketStreamHandleImpls instead of SocketStreamHandles now have them.
+ This patch doesn't change behavior.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::didCloseSocketStream):
+ (WebCore::WebSocketChannel::didReceiveSocketStreamData):
+ * Modules/websockets/WebSocketChannel.h:
+ * platform/network/SocketStreamHandle.cpp:
+ (WebCore::SocketStreamHandle::state):
+ (WebCore::SocketStreamHandle::send):
+ * platform/network/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::~SocketStreamHandle):
+ (WebCore::SocketStreamHandle::bufferedAmount):
+ (WebCore::SocketStreamHandle::client): Deleted.
+ * platform/network/SocketStreamHandleClient.h:
+ (WebCore::SocketStreamHandleClient::~SocketStreamHandleClient):
+ (WebCore::SocketStreamHandleClient::didOpenSocketStream): Deleted.
+ (WebCore::SocketStreamHandleClient::didCloseSocketStream): Deleted.
+ (WebCore::SocketStreamHandleClient::didReceiveSocketStreamData): Deleted.
+ (WebCore::SocketStreamHandleClient::didUpdateBufferedAmount): Deleted.
+ (WebCore::SocketStreamHandleClient::didFailSocketStream): Deleted.
+ * platform/network/cf/SocketStreamHandleImpl.h:
+ (WebCore::SocketStreamHandleImpl::create):
+ * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+ (WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl):
+ (WebCore::SocketStreamHandleImpl::platformSend):
+ (WebCore::SocketStreamHandleImpl::platformClose):
+ * platform/network/curl/SocketStreamHandleImpl.h:
+ (WebCore::SocketStreamHandleImpl::create):
+ * platform/network/soup/SocketStreamHandleImpl.h:
+ * platform/network/soup/SocketStreamHandleImplSoup.cpp:
+ (WebCore::SocketStreamHandleImpl::create):
+
</ins><span class="cx"> 2016-08-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204506.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -308,15 +308,18 @@
</span><span class="cx"> deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, int len)
</del><ins>+void WebSocketChannel::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, Optional<size_t> len)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %d bytes", this, len);
</del><ins>+ if (len)
+ LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %zu bytes", this, len.value());
+ else
+ LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received no bytes", this);
</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 <= 0) {
</del><ins>+ if (!len || !len.value()) {
</ins><span class="cx"> handle.disconnect();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -327,14 +330,15 @@
</span><span class="cx"> }
</span><span class="cx"> if (m_shouldDiscardReceivedData)
</span><span class="cx"> return;
</span><del>- if (!appendToBuffer(data, len)) {
</del><ins>+ if (!appendToBuffer(data, len.value())) {
</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="cx"> }
</span><del>- while (!m_suspended && m_client && !m_buffer.isEmpty())
</del><ins>+ while (!m_suspended && m_client && !m_buffer.isEmpty()) {
</ins><span class="cx"> if (!processBuffer())
</span><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -80,11 +80,11 @@
</span><span class="cx"> void resume() override;
</span><span class="cx">
</span><span class="cx"> // SocketStreamHandleClient functions.
</span><del>- void didOpenSocketStream(SocketStreamHandle&) override;
- void didCloseSocketStream(SocketStreamHandle&) override;
- void didReceiveSocketStreamData(SocketStreamHandle&, const char*, int) override;
- void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) override;
- void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) override;
</del><ins>+ void didOpenSocketStream(SocketStreamHandle&) final;
+ void didCloseSocketStream(SocketStreamHandle&) final;
+ void didReceiveSocketStreamData(SocketStreamHandle&, const char*, Optional<size_t>) final;
+ void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) final;
+ void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) final;
</ins><span class="cx">
</span><span class="cx"> enum CloseEventCode {
</span><span class="cx"> CloseEventCodeNotSpecified = -1,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandle.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandle.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandle.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return m_state;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SocketStreamHandle::send(const char* data, int length)
</del><ins>+bool SocketStreamHandle::send(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> if (m_state == Connecting || m_state == Closing)
</span><span class="cx"> return false;
</span><span class="lines">@@ -62,11 +62,13 @@
</span><span class="cx"> m_client.didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- int bytesWritten = 0;
- if (m_state == Open)
- bytesWritten = platformSend(data, length);
- if (bytesWritten < 0)
- return false;
</del><ins>+ size_t bytesWritten = 0;
+ if (m_state == Open) {
+ if (auto result = platformSend(data, length))
+ bytesWritten = result.value();
+ else
+ return false;
+ }
</ins><span class="cx"> if (m_buffer.size() + length - bytesWritten > bufferSize) {
</span><span class="cx"> // FIXME: report error to indicate that buffer has no more space.
</span><span class="cx"> return false;
</span><span class="lines">@@ -110,10 +112,13 @@
</span><span class="cx"> }
</span><span class="cx"> bool pending;
</span><span class="cx"> do {
</span><del>- int bytesWritten = platformSend(m_buffer.firstBlockData(), m_buffer.firstBlockSize());
- pending = bytesWritten != static_cast<int>(m_buffer.firstBlockSize());
- if (bytesWritten <= 0)
</del><ins>+ auto result = platformSend(m_buffer.firstBlockData(), m_buffer.firstBlockSize());
+ if (!result)
</ins><span class="cx"> return false;
</span><ins>+ size_t bytesWritten = result.value();
+ if (!bytesWritten)
+ return false;
+ pending = bytesWritten != m_buffer.firstBlockSize();
</ins><span class="cx"> ASSERT(m_buffer.size() - bytesWritten <= bufferSize);
</span><span class="cx"> m_buffer.consume(bytesWritten);
</span><span class="cx"> } while (!pending && !m_buffer.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandle.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandle.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandle.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -45,18 +45,16 @@
</span><span class="cx"> virtual ~SocketStreamHandle() { }
</span><span class="cx"> SocketStreamState state() const;
</span><span class="cx">
</span><del>- bool send(const char* data, int length);
</del><ins>+ bool send(const char* data, size_t length);
</ins><span class="cx"> void close(); // Disconnect after all data in buffer are sent.
</span><span class="cx"> void disconnect();
</span><span class="cx"> size_t bufferedAmount() const { return m_buffer.size(); }
</span><span class="cx">
</span><del>- SocketStreamHandleClient& client() const { return m_client; }
-
</del><span class="cx"> protected:
</span><span class="cx"> SocketStreamHandle(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><span class="cx"> bool sendPendingData();
</span><del>- virtual int platformSend(const char* data, int length) = 0;
</del><ins>+ virtual Optional<size_t> platformSend(const char* data, size_t length) = 0;
</ins><span class="cx"> virtual void platformClose() = 0;
</span><span class="cx">
</span><span class="cx"> URL m_url;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class SocketStreamError;
</span><span class="lines">@@ -40,12 +42,11 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~SocketStreamHandleClient() { }
</span><span class="cx">
</span><del>- virtual void didOpenSocketStream(SocketStreamHandle&) { }
- virtual void didCloseSocketStream(SocketStreamHandle&) { }
- virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* /*data*/, int /*length*/) { }
- virtual void didUpdateBufferedAmount(SocketStreamHandle&, size_t /*bufferedAmount*/) { }
-
- virtual void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) { }
</del><ins>+ virtual void didOpenSocketStream(SocketStreamHandle&) = 0;
+ virtual void didCloseSocketStream(SocketStreamHandle&) = 0;
+ virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* data, Optional<size_t> length) = 0;
+ virtual void didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount) = 0;
+ virtual void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -45,12 +45,12 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandleImpl : public SocketStreamHandle {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID sessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client, sessionID)); }
</del><ins>+ static Ref<SocketStreamHandleImpl> create(const URL& url, SocketStreamHandleClient& client, SessionID sessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client, sessionID)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandleImpl();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual int platformSend(const char* data, int length);
</del><ins>+ virtual Optional<size_t> platformSend(const char* data, size_t length);
</ins><span class="cx"> virtual void platformClose();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&, SessionID);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleImplCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -536,7 +536,11 @@
</span><span class="cx"> if (!length)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didReceiveSocketStreamData(*this, reinterpret_cast<const char*>(ptr), length);
</del><ins>+ Optional<size_t> optionalLength;
+ if (length != -1)
+ optionalLength = length;
+
+ m_client.didReceiveSocketStreamData(*this, reinterpret_cast<const char*>(ptr), optionalLength);
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -649,12 +653,17 @@
</span><span class="cx"> ASSERT(!m_pacRunLoopSource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int SocketStreamHandleImpl::platformSend(const char* data, int length)
</del><ins>+Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> if (!CFWriteStreamCanAcceptBytes(m_writeStream.get()))
</span><del>- return 0;
</del><ins>+ return Nullopt;
</ins><span class="cx">
</span><del>- return CFWriteStreamWrite(m_writeStream.get(), reinterpret_cast<const UInt8*>(data), length);
</del><ins>+ CFIndex result = CFWriteStreamWrite(m_writeStream.get(), reinterpret_cast<const UInt8*>(data), length);
+ if (result == -1)
+ return Nullopt;
+
+ ASSERT(result >= 0);
+ return static_cast<size_t>(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandleImpl::platformClose()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandleImpl : public SocketStreamHandle {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client)); }
</del><ins>+ static Ref<SocketStreamHandleImpl> create(const URL& url, SocketStreamHandleClient& client, SessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandleImpl();
</span><span class="cx">
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> private:
</span><span class="cx"> SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><del>- int platformSend(const char* data, int length) override;
- void platformClose() override;
</del><ins>+ Optional<size_t> platformSend(const char* data, size_t length) final;
+ void platformClose() final;
</ins><span class="cx">
</span><span class="cx"> bool readData(CURL*);
</span><span class="cx"> bool sendData(CURL*);
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> void didReceiveData();
</span><span class="cx"> void didOpenSocket();
</span><span class="cx">
</span><del>- static std::unique_ptr<char[]> createCopy(const char* data, int length);
</del><ins>+ static std::unique_ptr<char[]> createCopy(const char* data, size_t length);
</ins><span class="cx">
</span><span class="cx"> struct SocketData {
</span><del>- SocketData(std::unique_ptr<char[]>&& source, int length)
</del><ins>+ SocketData(std::unique_ptr<char[]>&& source, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> data = WTFMove(source);
</span><span class="cx"> size = length;
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<char[]> data;
</span><del>- int size { 0 };
</del><ins>+ size_t size { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ThreadIdentifier m_workerThread { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleImplCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> ASSERT(!m_workerThread);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int SocketStreamHandleImpl::platformSend(const char* data, int length)
</del><ins>+Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformSend", this);
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx">
</span><del>- const int bufferSize = 1024;
</del><ins>+ const size_t bufferSize = 1024;
</ins><span class="cx"> std::unique_ptr<char[]> data(new char[bufferSize]);
</span><span class="cx"> size_t bytesRead = 0;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> if (ret == CURLE_OK && bytesRead >= 0) {
</span><span class="cx"> m_mutexReceive.lock();
</span><del>- m_receiveData.append(SocketData { WTFMove(data), static_cast<int>(bytesRead) });
</del><ins>+ m_receiveData.append(SocketData { WTFMove(data), bytesRead });
</ins><span class="cx"> m_mutexReceive.unlock();
</span><span class="cx">
</span><span class="cx"> ref();
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> auto sendData = m_sendData.takeFirst();
</span><span class="cx"> m_mutexSend.unlock();
</span><span class="cx">
</span><del>- int totalBytesSent = 0;
</del><ins>+ size_t totalBytesSent = 0;
</ins><span class="cx"> while (totalBytesSent < sendData.size) {
</span><span class="cx"> size_t bytesSent = 0;
</span><span class="cx"> CURLcode ret = curl_easy_send(curlHandle, sendData.data.get() + totalBytesSent, sendData.size - totalBytesSent, &bytesSent);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> // Insert remaining data into send queue.
</span><span class="cx">
</span><span class="cx"> if (totalBytesSent < sendData.size) {
</span><del>- const int restLength = sendData.size - totalBytesSent;
</del><ins>+ const size_t restLength = sendData.size - totalBytesSent;
</ins><span class="cx"> auto copy = createCopy(sendData.data.get() + totalBytesSent, restLength);
</span><span class="cx">
</span><span class="cx"> std::lock_guard<Lock> lock(m_mutexSend);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandleImpl final : public SocketStreamHandle {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL&, SocketStreamHandleClient&, SessionID);
</del><ins>+ static Ref<SocketStreamHandleImpl> create(const URL&, SocketStreamHandleClient&, SessionID);
</ins><span class="cx"> static Ref<SocketStreamHandle> create(GSocketConnection*, SocketStreamHandleClient&);
</span><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandleImpl();
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> private:
</span><span class="cx"> SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
</span><span class="cx">
</span><del>- int platformSend(const char* data, int length) override;
- void platformClose() override;
</del><ins>+ Optional<size_t> platformSend(const char* data, size_t length) final;
+ void platformClose() final;
</ins><span class="cx">
</span><span class="cx"> void beginWaitingForSocketWritability();
</span><span class="cx"> void stopWaitingForSocketWritability();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SocketStreamHandle> SocketStreamHandleImpl::create(const URL& url, SocketStreamHandleClient& client, SessionID)
</del><ins>+Ref<SocketStreamHandleImpl> SocketStreamHandleImpl::create(const URL& url, SocketStreamHandleClient& client, SessionID)
</ins><span class="cx"> {
</span><span class="cx"> Ref<SocketStreamHandleImpl> socket = adoptRef(*new SocketStreamHandleImpl(url, client));
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> Ref<SocketStreamHandle> protectedSocketStreamHandle = socket.copyRef();
</span><span class="cx"> g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, socket->m_cancellable.get(),
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(connectedCallback), &protectedSocketStreamHandle.leakRef());
</span><del>- return WTFMove(socket);
</del><ins>+ return socket;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<SocketStreamHandle> SocketStreamHandleImpl::create(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
</span><span class="lines">@@ -128,7 +128,10 @@
</span><span class="cx">
</span><span class="cx"> // The client can close the handle, potentially removing the last reference.
</span><span class="cx"> RefPtr<SocketStreamHandle> protectedThis(this);
</span><del>- m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), bytesRead);
</del><ins>+ Optional<size_t> optionalLength;
+ if (bytesRead != -1)
+ optionalLength = static_cast<size_t>(bytesRead);
+ m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), optionalLength);
</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 class="lines">@@ -168,11 +171,11 @@
</span><span class="cx"> sendPendingData();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int SocketStreamHandleImpl::platformSend(const char* data, int length)
</del><ins>+Optional<size_t> SocketStreamHandleImpl::platformSend(const char* data, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformSend", this);
</span><span class="cx"> if (!m_outputStream || !data)
</span><del>- return 0;
</del><ins>+ return Nullopt;
</ins><span class="cx">
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, m_cancellable.get(), &error.outPtr());
</span><span class="lines">@@ -181,15 +184,18 @@
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx"> else
</span><span class="cx"> didFail(SocketStreamError(error->code, String(), error->message));
</span><del>- return 0;
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we did not send all the bytes we were given, we know that
</span><span class="cx"> // SocketStreamHandle will need to send more in the future.
</span><del>- if (written < length)
</del><ins>+ if (written == -1 || static_cast<size_t>(written) < length)
</ins><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx">
</span><del>- return written;
</del><ins>+ if (written == -1)
+ return Nullopt;
+
+ return static_cast<size_t>(written);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandleImpl::platformClose()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-16 Alex Christensen <achristensen@webkit.org>
+
+ Clean up WebSockets
+ https://bugs.webkit.org/show_bug.cgi?id=160889
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+ (WebKit::WebSocketServerConnection::didCloseSocketStream):
+ (WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
+ * UIProcess/InspectorServer/WebSocketServerConnection.h:
+
</ins><span class="cx"> 2016-08-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204506.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -133,11 +133,12 @@
</span><span class="cx"> m_server->didCloseWebSocketServerConnection(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, int length)
</del><ins>+void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, Optional<size_t> length)
</ins><span class="cx"> {
</span><span class="cx"> // Each didReceiveData call adds more data to our buffer.
</span><span class="cx"> // We clear the buffer when we have handled data from it.
</span><del>- m_bufferedData.append(data, length);
</del><ins>+ if (length)
+ m_bufferedData.append(data, length.value());
</ins><span class="cx">
</span><span class="cx"> switch (m_mode) {
</span><span class="cx"> case HTTP:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h (204511 => 204512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2016-08-16 17:05:54 UTC (rev 204511)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2016-08-16 17:14:42 UTC (rev 204512)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebSocketServerConnection_h
-#define WebSocketServerConnection_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx">
</span><span class="lines">@@ -37,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class HTTPHeaderMap;
</span><ins>+class SocketStreamError;
</ins><span class="cx"> class SocketStreamHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,9 +67,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // SocketStreamHandleClient implementation.
</span><del>- void didCloseSocketStream(WebCore::SocketStreamHandle&) override;
- void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, int length) override;
- void didUpdateBufferedAmount(WebCore::SocketStreamHandle&, size_t bufferedAmount) override;
</del><ins>+ void didOpenSocketStream(WebCore::SocketStreamHandle&) final { }
+ void didCloseSocketStream(WebCore::SocketStreamHandle&) final;
+ void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, Optional<size_t> length) final;
+ void didUpdateBufferedAmount(WebCore::SocketStreamHandle&, size_t bufferedAmount) final;
+ void didFailSocketStream(WebCore::SocketStreamHandle&, const WebCore::SocketStreamError&) final { }
</ins><span class="cx">
</span><span class="cx"> // HTTP Mode.
</span><span class="cx"> void readHTTPMessage();
</span><span class="lines">@@ -91,5 +93,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR_SERVER)
</span><del>-
-#endif // WebSocketServerConnection_h
</del></span></pre>
</div>
</div>
</body>
</html>