<!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>[203217] 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/203217">203217</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-07-14 00:05:40 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize WebSocket handle
https://bugs.webkit.org/show_bug.cgi?id=159750
Reviewed by Brady Eidson.
Source/WebCore:
No new tests. No change in behavior.
This patch just removes ThreadableWebSocketChannel::InvalidMessage which is never used
and makes our use of SocketStreamHandleClient a reference instead of a pointer.
* Modules/websockets/ThreadableWebSocketChannel.h:
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::send):
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::connect):
* platform/network/SocketStreamHandleBase.cpp:
(WebCore::SocketStreamHandleBase::SocketStreamHandleBase):
(WebCore::SocketStreamHandleBase::send):
(WebCore::SocketStreamHandleBase::disconnect):
(WebCore::SocketStreamHandleBase::sendPendingData):
(WebCore::SocketStreamHandleBase::setClient): Deleted.
* platform/network/SocketStreamHandleBase.h:
(WebCore::SocketStreamHandleBase::~SocketStreamHandleBase):
(WebCore::SocketStreamHandleBase::bufferedAmount):
(WebCore::SocketStreamHandleBase::client):
* platform/network/cf/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::addCONNECTCredentials):
(WebCore::SocketStreamHandle::copyCFStreamDescription):
(WebCore::SocketStreamHandle::readStreamCallback):
(WebCore::SocketStreamHandle::writeStreamCallback):
(WebCore::SocketStreamHandle::reportErrorToClient):
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::port):
* platform/network/curl/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
* platform/network/curl/SocketStreamHandleCurl.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::readData):
(WebCore::SocketStreamHandle::didReceiveData):
(WebCore::SocketStreamHandle::didOpenSocket):
(WebCore::SocketStreamHandle::createCopy):
* platform/network/soup/SocketStreamHandle.h:
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::connected):
(WebCore::SocketStreamHandle::connectedCallback):
(WebCore::SocketStreamHandle::readBytes):
(WebCore::SocketStreamHandle::didFail):
(WebCore::SocketStreamHandle::writeReady):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
Source/WebKit2:
* UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
(WebKit::connectionCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleBasecpp">trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamHandleBaseh">trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh">trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleh">trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp">trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/ChangeLog 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2016-07-13 Alex Christensen <achristensen@webkit.org>
+
+ Modernize WebSocket handle
+ https://bugs.webkit.org/show_bug.cgi?id=159750
+
+ Reviewed by Brady Eidson.
+
+ No new tests. No change in behavior.
+ This patch just removes ThreadableWebSocketChannel::InvalidMessage which is never used
+ and makes our use of SocketStreamHandleClient a reference instead of a pointer.
+
+ * Modules/websockets/ThreadableWebSocketChannel.h:
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::send):
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::connect):
+ * platform/network/SocketStreamHandleBase.cpp:
+ (WebCore::SocketStreamHandleBase::SocketStreamHandleBase):
+ (WebCore::SocketStreamHandleBase::send):
+ (WebCore::SocketStreamHandleBase::disconnect):
+ (WebCore::SocketStreamHandleBase::sendPendingData):
+ (WebCore::SocketStreamHandleBase::setClient): Deleted.
+ * platform/network/SocketStreamHandleBase.h:
+ (WebCore::SocketStreamHandleBase::~SocketStreamHandleBase):
+ (WebCore::SocketStreamHandleBase::bufferedAmount):
+ (WebCore::SocketStreamHandleBase::client):
+ * platform/network/cf/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::addCONNECTCredentials):
+ (WebCore::SocketStreamHandle::copyCFStreamDescription):
+ (WebCore::SocketStreamHandle::readStreamCallback):
+ (WebCore::SocketStreamHandle::writeStreamCallback):
+ (WebCore::SocketStreamHandle::reportErrorToClient):
+ (WebCore::SocketStreamHandle::~SocketStreamHandle):
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::port):
+ * platform/network/curl/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ * platform/network/curl/SocketStreamHandleCurl.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::readData):
+ (WebCore::SocketStreamHandle::didReceiveData):
+ (WebCore::SocketStreamHandle::didOpenSocket):
+ (WebCore::SocketStreamHandle::createCopy):
+ * platform/network/soup/SocketStreamHandle.h:
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::~SocketStreamHandle):
+ (WebCore::SocketStreamHandle::connected):
+ (WebCore::SocketStreamHandle::connectedCallback):
+ (WebCore::SocketStreamHandle::readBytes):
+ (WebCore::SocketStreamHandle::didFail):
+ (WebCore::SocketStreamHandle::writeReady):
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
+
</ins><span class="cx"> 2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLib] Use a GSource instead of a thread to poll memory pressure eventFD in linux implementation
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -54,8 +54,7 @@
</span><span class="cx">
</span><span class="cx"> enum SendResult {
</span><span class="cx"> SendSuccess,
</span><del>- SendFail,
- InvalidMessage
</del><ins>+ SendFail
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual void connect(const URL&, const String& protocol) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -338,12 +338,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_channel);
</span><del>- ThreadableWebSocketChannel::SendResult result = m_channel->send(message);
- if (result == ThreadableWebSocketChannel::InvalidMessage) {
- scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Websocket message contains invalid character(s)."));
- ec = SYNTAX_ERR;
- return;
- }
</del><ins>+ m_channel->send(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocket::send(ArrayBuffer& binaryData, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if (NetworkingContext* networkingContext = frame->loader().networkingContext()) {
</span><span class="cx"> ref();
</span><span class="cx"> Page* page = frame->page();
</span><del>- m_handle = SocketStreamHandle::create(m_handshake->url(), this, *networkingContext, (page ? page->usesEphemeralSession() : false));
</del><ins>+ m_handle = SocketStreamHandle::create(m_handshake->url(), *this, *networkingContext, (page ? page->usesEphemeralSession() : false));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> const unsigned int bufferSize = 100 * 1024 * 1024;
</span><span class="cx">
</span><del>-SocketStreamHandleBase::SocketStreamHandleBase(const URL& url, SocketStreamHandleClient* client)
</del><ins>+SocketStreamHandleBase::SocketStreamHandleBase(const URL& url, SocketStreamHandleClient& client)
</ins><span class="cx"> : m_url(url)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_state(Connecting)
</span><span class="lines">@@ -60,8 +60,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> m_buffer.append(data, length);
</span><del>- if (m_client)
- m_client->didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</del><ins>+ m_client.didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> int bytesWritten = 0;
</span><span class="lines">@@ -75,8 +74,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (bytesWritten < length) {
</span><span class="cx"> m_buffer.append(data + bytesWritten, length - bytesWritten);
</span><del>- if (m_client)
- m_client->didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</del><ins>+ m_client.didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -99,12 +97,6 @@
</span><span class="cx"> m_state = Closed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SocketStreamHandleBase::setClient(SocketStreamHandleClient* client)
-{
- ASSERT(!client || (!m_client && m_state == Connecting));
- m_client = client;
-}
-
</del><span class="cx"> bool SocketStreamHandleBase::sendPendingData()
</span><span class="cx"> {
</span><span class="cx"> if (m_state != Open && m_state != Closing)
</span><span class="lines">@@ -126,8 +118,7 @@
</span><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><del>- if (m_client)
- m_client->didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</del><ins>+ m_client.didUpdateBufferedAmount(static_cast<SocketStreamHandle&>(*this), bufferedAmount());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -36,34 +36,33 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class SocketStreamHandle;
- class SocketStreamHandleClient;
</del><ins>+class SocketStreamHandle;
+class SocketStreamHandleClient;
</ins><span class="cx">
</span><del>- class SocketStreamHandleBase {
- public:
- enum SocketStreamState { Connecting, Open, Closing, Closed };
- virtual ~SocketStreamHandleBase() { }
- SocketStreamState state() const;
</del><ins>+class SocketStreamHandleBase {
+public:
+ enum SocketStreamState { Connecting, Open, Closing, Closed };
+ virtual ~SocketStreamHandleBase() { }
+ SocketStreamState state() const;
</ins><span class="cx">
</span><del>- bool send(const char* data, int length);
- void close(); // Disconnect after all data in buffer are sent.
- void disconnect();
- size_t bufferedAmount() const { return m_buffer.size(); }
</del><ins>+ bool send(const char* data, int length);
+ void close(); // Disconnect after all data in buffer are sent.
+ void disconnect();
+ size_t bufferedAmount() const { return m_buffer.size(); }
</ins><span class="cx">
</span><del>- SocketStreamHandleClient* client() const { return m_client; }
- void setClient(SocketStreamHandleClient*);
</del><ins>+ SocketStreamHandleClient& client() const { return m_client; }
</ins><span class="cx">
</span><del>- protected:
- SocketStreamHandleBase(const URL&, SocketStreamHandleClient*);
</del><ins>+protected:
+ SocketStreamHandleBase(const URL&, SocketStreamHandleClient&);
</ins><span class="cx">
</span><del>- bool sendPendingData();
- virtual int platformSend(const char* data, int length) = 0;
- virtual void platformClose() = 0;
</del><ins>+ bool sendPendingData();
+ virtual int platformSend(const char* data, int length) = 0;
+ virtual void platformClose() = 0;
</ins><span class="cx">
</span><del>- URL m_url;
- SocketStreamHandleClient* m_client;
- StreamBuffer<char, 1024 * 1024> m_buffer;
- SocketStreamState m_state;
- };
</del><ins>+ URL m_url;
+ SocketStreamHandleClient& m_client;
+ StreamBuffer<char, 1024 * 1024> m_buffer;
+ SocketStreamState m_state;
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext& networkingContext, bool usesEphemeralSession) { return adoptRef(*new SocketStreamHandle(url, client, networkingContext, usesEphemeralSession)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext& networkingContext, bool usesEphemeralSession) { return adoptRef(*new SocketStreamHandle(url, client, networkingContext, usesEphemeralSession)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual int platformSend(const char* data, int length);
</span><span class="cx"> virtual void platformClose();
</span><span class="cx">
</span><del>- SocketStreamHandle(const URL&, SocketStreamHandleClient*, NetworkingContext&, bool usesEphemeralSession);
</del><ins>+ SocketStreamHandle(const URL&, SocketStreamHandleClient&, NetworkingContext&, bool usesEphemeralSession);
</ins><span class="cx"> void createStreams();
</span><span class="cx"> void scheduleStreams();
</span><span class="cx"> void chooseProxy();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client, NetworkingContext& networkingContext, bool usesEphemeralSession)
</del><ins>+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client, NetworkingContext& networkingContext, bool usesEphemeralSession)
</ins><span class="cx"> : SocketStreamHandleBase(url, client)
</span><span class="cx"> , m_connectingSubstate(New)
</span><span class="cx"> , m_connectionType(Unknown)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> , m_sentStoredCredentials(false)
</span><span class="cx"> , m_networkingContext(networkingContext)
</span><span class="cx"> {
</span><del>- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</del><ins>+ LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</ins><span class="cx">
</span><span class="cx"> ASSERT(url.protocolIs("ws") || url.protocolIs("wss"));
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if (url.protocolIs("ws")
</span><span class="cx"> && !usesEphemeralSession
</span><span class="cx"> && _CFNetworkIsKnownHSTSHostWithSession(m_httpsURL.get(), nullptr)) {
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "WebSocket connection failed because it violates HTTP Strict Transport Security."));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "WebSocket connection failed because it violates HTTP Strict Transport Security."));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx">
</span><span class="cx"> if (!CFHTTPAuthenticationRequiresUserNameAndPassword(authentication.get())) {
</span><span class="cx"> // That's all we can offer...
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy authentication scheme is not supported for WebSockets"));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy authentication scheme is not supported for WebSockets"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx">
</span><span class="cx"> if (!methodCF || !realmCF) {
</span><span class="cx"> // This shouldn't happen, but on some OS versions we get incomplete authentication data, see <rdar://problem/10416316>.
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "WebSocket proxy authentication couldn't be handled"));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "WebSocket proxy authentication couldn't be handled"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx">
</span><span class="cx"> if (!proxyAuthorizationString) {
</span><span class="cx"> // Fails e.g. for NTLM auth.
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy authentication scheme is not supported for WebSockets"));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy authentication scheme is not supported for WebSockets"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: On platforms where AuthBrokerAgent is not available, ask the client if credentials could not be found.
</span><span class="cx">
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy credentials are not available"));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy credentials are not available"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CFStringRef SocketStreamHandle::copyCFStreamDescription(void* info)
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> addCONNECTCredentials(proxyResponse.get());
</span><span class="cx"> return;
</span><span class="cx"> default:
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(static_cast<int>(proxyResponseCode), m_url.string(), "Proxy connection could not be established, unexpected response code"));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(static_cast<int>(proxyResponseCode), m_url.string(), "Proxy connection could not be established, unexpected response code"));
</ins><span class="cx"> platformClose();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_connectingSubstate = Connected;
</span><span class="cx"> m_state = Open;
</span><del>- m_client->didOpenSocketStream(*this);
</del><ins>+ m_client.didOpenSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Not an "else if", we could have made a client call above, and it could close the connection.
</span><span class="lines">@@ -533,7 +533,7 @@
</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>+ 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 class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_connectingSubstate = Connected;
</span><span class="cx"> m_state = Open;
</span><del>- m_client->didOpenSocketStream(*this);
</del><ins>+ m_client.didOpenSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Not an "else if", we could have made a client call above, and it could close the connection.
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> description = String(descriptionCF.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
</del><ins>+ m_client.didFailSocketStream(*this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SocketStreamHandle::~SocketStreamHandle()
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx"> ASSERT(!m_readStream == !m_writeStream);
</span><span class="cx"> if (!m_readStream) {
</span><span class="cx"> if (m_connectingSubstate == New || m_connectingSubstate == ExecutingPACFile)
</span><del>- m_client->didCloseSocketStream(*this);
</del><ins>+ m_client.didCloseSocketStream(*this);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> m_readStream = 0;
</span><span class="cx"> m_writeStream = 0;
</span><span class="cx">
</span><del>- m_client->didCloseSocketStream(*this);
</del><ins>+ m_client.didCloseSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned short SocketStreamHandle::port() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SocketStreamHandle(const URL&, SocketStreamHandleClient*);
</del><ins>+ SocketStreamHandle(const URL&, SocketStreamHandleClient&);
</ins><span class="cx">
</span><span class="cx"> int platformSend(const char* data, int length) override;
</span><span class="cx"> void platformClose() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client)
</del><ins>+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
</ins><span class="cx"> : SocketStreamHandleBase(url, client)
</span><span class="cx"> {
</span><del>- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</del><ins>+ LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> startThread();
</span><span class="cx"> }
</span><span class="lines">@@ -80,8 +80,7 @@
</span><span class="cx">
</span><span class="cx"> stopThread();
</span><span class="cx">
</span><del>- if (m_client)
- m_client->didCloseSocketStream(*this);
</del><ins>+ m_client.didCloseSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SocketStreamHandle::readData(CURL* curlHandle)
</span><span class="lines">@@ -256,8 +255,8 @@
</span><span class="cx">
</span><span class="cx"> for (auto& socketData : receiveData) {
</span><span class="cx"> if (socketData.size > 0) {
</span><del>- if (m_client && state() == Open)
- m_client->didReceiveSocketStreamData(*this, socketData.data.get(), socketData.size);
</del><ins>+ if (state() == Open)
+ m_client.didReceiveSocketStreamData(*this, socketData.data.get(), socketData.size);
</ins><span class="cx"> } else
</span><span class="cx"> platformClose();
</span><span class="cx"> }
</span><span class="lines">@@ -269,8 +268,7 @@
</span><span class="cx">
</span><span class="cx"> m_state = Open;
</span><span class="cx">
</span><del>- if (m_client)
- m_client->didOpenSocketStream(*this);
</del><ins>+ m_client.didOpenSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<char[]> SocketStreamHandle::createCopy(const char* data, int length)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle final : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
- static Ref<SocketStreamHandle> create(GSocketConnection* socketConnection, SocketStreamHandleClient* client) { return adoptRef(*new SocketStreamHandle(socketConnection, client)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
+ static Ref<SocketStreamHandle> create(GSocketConnection* socketConnection, SocketStreamHandleClient& client) { return adoptRef(*new SocketStreamHandle(socketConnection, client)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SocketStreamHandle(const URL&, SocketStreamHandleClient*);
- SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient*);
</del><ins>+ SocketStreamHandle(const URL&, SocketStreamHandleClient&);
+ SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient&);
</ins><span class="cx">
</span><span class="cx"> int platformSend(const char* data, int length) override;
</span><span class="cx"> void platformClose() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client)
</del><ins>+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
</ins><span class="cx"> : SocketStreamHandleBase(url, client)
</span><span class="cx"> , m_cancellable(adoptGRef(g_cancellable_new()))
</span><span class="cx"> {
</span><del>- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</del><ins>+ LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</ins><span class="cx"> unsigned port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
</span><span class="cx">
</span><span class="cx"> GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(connectedCallback), protectedThis.leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(GSocketConnection* socketConnection, SocketStreamHandleClient* client)
</del><ins>+SocketStreamHandle::SocketStreamHandle(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
</ins><span class="cx"> : SocketStreamHandleBase(URL(), client)
</span><span class="cx"> , m_cancellable(adoptGRef(g_cancellable_new()))
</span><span class="cx"> {
</span><del>- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</del><ins>+ LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</ins><span class="cx"> GRefPtr<GSocketConnection> connection = socketConnection;
</span><span class="cx"> connected(WTFMove(connection));
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx"> SocketStreamHandle::~SocketStreamHandle()
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p delete", this);
</span><del>- setClient(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::connected(GRefPtr<GSocketConnection>&& socketConnection)
</span><span class="lines">@@ -91,7 +90,7 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), protectedThis.leakRef());
</span><span class="cx">
</span><span class="cx"> m_state = Open;
</span><del>- m_client->didOpenSocketStream(*this);
</del><ins>+ m_client.didOpenSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::connectedCallback(GSocketClient* client, GAsyncResult* result, SocketStreamHandle* handle)
</span><span class="lines">@@ -124,7 +123,7 @@
</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>+ m_client.didReceiveSocketStreamData(*this, m_readBuffer.get(), 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 class="lines">@@ -150,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::didFail(SocketStreamError&& error)
</span><span class="cx"> {
</span><del>- m_client->didFailSocketStream(*this, WTFMove(error));
</del><ins>+ m_client.didFailSocketStream(*this, WTFMove(error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::writeReady()
</span><span class="lines">@@ -207,7 +206,7 @@
</span><span class="cx"> m_inputStream = nullptr;
</span><span class="cx"> m_readBuffer = nullptr;
</span><span class="cx">
</span><del>- m_client->didCloseSocketStream(*this);
</del><ins>+ m_client.didCloseSocketStream(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::beginWaitingForSocketWritability()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-13 Alex Christensen <achristensen@webkit.org>
+
+ Modernize WebSocket handle
+ https://bugs.webkit.org/show_bug.cgi?id=159750
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
+ (WebKit::connectionCallback):
+
</ins><span class="cx"> 2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r202273): [GTK] Redirected X window is resized to the previous size on size allocate
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp (203216 => 203217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2016-07-14 06:36:25 UTC (rev 203216)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2016-07-14 07:05:40 UTC (rev 203217)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto webSocketConnection = std::make_unique<WebSocketServerConnection>(server->client(), server);
</span><del>- webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, webSocketConnection.get()));
</del><ins>+ webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, *webSocketConnection));
</ins><span class="cx"> server->didAcceptConnection(WTFMove(webSocketConnection));
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span></span></pre>
</div>
</div>
</body>
</html>