<!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>[201880] 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/201880">201880</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 13:10:30 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up WebSocket code
https://bugs.webkit.org/show_bug.cgi?id=158551
Reviewed by Darin Adler.
Source/WebCore:
No new tests. There is no change in behavior.
There seems to be no reason why SocketStreamHandle should be an AuthenticationClient.
* Modules/websockets/ThreadableWebSocketChannel.h:
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::setSendRequestResult):
(WebCore::ThreadableWebSocketChannelClientWrapper::bufferedAmount):
(WebCore::ThreadableWebSocketChannelClientWrapper::setBufferedAmount):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
(WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount):
(WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake):
(WebCore::ThreadableWebSocketChannelClientWrapper::didClose):
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
* Modules/websockets/WebSocket.cpp:
(WebCore::joinStrings):
(WebCore::saturateAdd):
(WebCore::WebSocket::send):
(WebCore::WebSocket::readyState):
(WebCore::WebSocket::bufferedAmount):
(WebCore::WebSocket::didReceiveBinaryData):
(WebCore::WebSocket::didReceiveMessageError):
(WebCore::WebSocket::didUpdateBufferedAmount):
(WebCore::WebSocket::didStartClosingHandshake):
(WebCore::WebSocket::didClose):
* Modules/websockets/WebSocket.h:
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::WebSocketChannel):
(WebCore::WebSocketChannel::~WebSocketChannel):
(WebCore::WebSocketChannel::send):
(WebCore::WebSocketChannel::bufferedAmount):
(WebCore::WebSocketChannel::resume):
(WebCore::WebSocketChannel::willOpenSocketStream):
(WebCore::WebSocketChannel::didOpenSocketStream):
(WebCore::WebSocketChannel::didCloseSocketStream):
(WebCore::WebSocketChannel::didReceiveSocketStreamData):
(WebCore::WebSocketChannel::didUpdateBufferedAmount):
(WebCore::WebSocketChannel::didFailSocketStream):
(WebCore::WebSocketChannel::didStartLoading):
(WebCore::WebSocketChannel::appendToBuffer):
(WebCore::WebSocketChannel::processBuffer):
(WebCore::WebSocketChannel::resumeTimerFired):
(WebCore::WebSocketChannel::startClosingHandshake):
(WebCore::WebSocketChannel::didReceiveAuthenticationChallenge): Deleted.
(WebCore::WebSocketChannel::didCancelAuthenticationChallenge): Deleted.
* Modules/websockets/WebSocketChannel.h:
* Modules/websockets/WebSocketChannelClient.h:
(WebCore::WebSocketChannelClient::~WebSocketChannelClient):
(WebCore::WebSocketChannelClient::didConnect):
(WebCore::WebSocketChannelClient::didReceiveMessage):
(WebCore::WebSocketChannelClient::didReceiveBinaryData):
(WebCore::WebSocketChannelClient::didReceiveMessageError):
(WebCore::WebSocketChannelClient::didUpdateBufferedAmount):
(WebCore::WebSocketChannelClient::didStartClosingHandshake):
(WebCore::WebSocketChannelClient::didClose):
(WebCore::WebSocketChannelClient::WebSocketChannelClient):
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::send):
(WebCore::WorkerThreadableWebSocketChannel::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
* platform/network/BlobData.cpp:
(WebCore::BlobData::appendData):
(WebCore::BlobData::appendFile):
* platform/network/BlobData.h:
(WebCore::BlobDataItem::BlobDataItem):
* platform/network/BlobRegistry.h:
* platform/network/BlobRegistryImpl.cpp:
(WebCore::BlobRegistryImpl::appendStorageItems):
(WebCore::BlobRegistryImpl::registerFileBlobURL):
(WebCore::BlobRegistryImpl::registerBlobURL):
(WebCore::BlobRegistryImpl::registerBlobURLOptionallyFileBacked):
(WebCore::BlobRegistryImpl::registerBlobURLForSlice):
* platform/network/BlobRegistryImpl.h:
* platform/network/SocketStreamHandleBase.cpp:
(WebCore::SocketStreamHandleBase::send):
(WebCore::SocketStreamHandleBase::disconnect):
(WebCore::SocketStreamHandleBase::sendPendingData):
* platform/network/SocketStreamHandleBase.h:
* platform/network/SocketStreamHandleClient.h:
(WebCore::SocketStreamHandleClient::~SocketStreamHandleClient):
(WebCore::SocketStreamHandleClient::willOpenSocketStream):
(WebCore::SocketStreamHandleClient::didOpenSocketStream):
(WebCore::SocketStreamHandleClient::didCloseSocketStream):
(WebCore::SocketStreamHandleClient::didReceiveSocketStreamData):
(WebCore::SocketStreamHandleClient::didUpdateBufferedAmount):
(WebCore::SocketStreamHandleClient::didFailSocketStream):
(WebCore::SocketStreamHandleClient::didReceiveAuthenticationChallenge): Deleted.
(WebCore::SocketStreamHandleClient::didCancelAuthenticationChallenge): Deleted.
* platform/network/cf/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
(WebCore::SocketStreamHandle::refAuthenticationClient): Deleted.
(WebCore::SocketStreamHandle::derefAuthenticationClient): Deleted.
* 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):
(WebCore::SocketStreamHandle::receivedCredential): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
(WebCore::SocketStreamHandle::receivedCancellation): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
(WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
* platform/network/curl/ResourceHandleCurl.cpp:
* platform/network/curl/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::SocketData::SocketData):
* platform/network/curl/SocketStreamHandleCurl.cpp:
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::readData):
(WebCore::SocketStreamHandle::didReceiveData):
(WebCore::SocketStreamHandle::didOpenSocket):
(WebCore::SocketStreamHandle::createCopy):
(WebCore::SocketStreamHandle::didReceiveAuthenticationChallenge): Deleted.
(WebCore::SocketStreamHandle::receivedCredential): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
(WebCore::SocketStreamHandle::receivedCancellation): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
(WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
* platform/network/soup/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::getHandleFromId):
(WebCore::deactivateHandle):
(WebCore::activateHandle):
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::connected):
(WebCore::SocketStreamHandle::readBytes):
(WebCore::SocketStreamHandle::platformSend):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
(WebCore::SocketStreamHandle::didReceiveAuthenticationChallenge): Deleted.
(WebCore::SocketStreamHandle::receivedCredential): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
(WebCore::SocketStreamHandle::receivedCancellation): Deleted.
(WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
(WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
Source/WebKit2:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::registerFileBlobURL):
* WebProcess/FileAPI/BlobRegistryProxy.h:</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="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</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="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelClienth">trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatacpp">trunk/Source/WebCore/platform/network/BlobData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatah">trunk/Source/WebCore/platform/network/BlobData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryh">trunk/Source/WebCore/platform/network/BlobRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplh">trunk/Source/WebCore/platform/network/BlobRegistryImpl.h</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="#trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth">trunk/Source/WebCore/platform/network/SocketStreamHandleClient.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="#trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.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="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/ChangeLog 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -1,3 +1,158 @@
</span><ins>+2016-06-09 Alex Christensen <achristensen@webkit.org>
+
+ Clean up WebSocket code
+ https://bugs.webkit.org/show_bug.cgi?id=158551
+
+ Reviewed by Darin Adler.
+
+ No new tests. There is no change in behavior.
+ There seems to be no reason why SocketStreamHandle should be an AuthenticationClient.
+
+ * Modules/websockets/ThreadableWebSocketChannel.h:
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::setSendRequestResult):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::bufferedAmount):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::setBufferedAmount):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didClose):
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::joinStrings):
+ (WebCore::saturateAdd):
+ (WebCore::WebSocket::send):
+ (WebCore::WebSocket::readyState):
+ (WebCore::WebSocket::bufferedAmount):
+ (WebCore::WebSocket::didReceiveBinaryData):
+ (WebCore::WebSocket::didReceiveMessageError):
+ (WebCore::WebSocket::didUpdateBufferedAmount):
+ (WebCore::WebSocket::didStartClosingHandshake):
+ (WebCore::WebSocket::didClose):
+ * Modules/websockets/WebSocket.h:
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::WebSocketChannel):
+ (WebCore::WebSocketChannel::~WebSocketChannel):
+ (WebCore::WebSocketChannel::send):
+ (WebCore::WebSocketChannel::bufferedAmount):
+ (WebCore::WebSocketChannel::resume):
+ (WebCore::WebSocketChannel::willOpenSocketStream):
+ (WebCore::WebSocketChannel::didOpenSocketStream):
+ (WebCore::WebSocketChannel::didCloseSocketStream):
+ (WebCore::WebSocketChannel::didReceiveSocketStreamData):
+ (WebCore::WebSocketChannel::didUpdateBufferedAmount):
+ (WebCore::WebSocketChannel::didFailSocketStream):
+ (WebCore::WebSocketChannel::didStartLoading):
+ (WebCore::WebSocketChannel::appendToBuffer):
+ (WebCore::WebSocketChannel::processBuffer):
+ (WebCore::WebSocketChannel::resumeTimerFired):
+ (WebCore::WebSocketChannel::startClosingHandshake):
+ (WebCore::WebSocketChannel::didReceiveAuthenticationChallenge): Deleted.
+ (WebCore::WebSocketChannel::didCancelAuthenticationChallenge): Deleted.
+ * Modules/websockets/WebSocketChannel.h:
+ * Modules/websockets/WebSocketChannelClient.h:
+ (WebCore::WebSocketChannelClient::~WebSocketChannelClient):
+ (WebCore::WebSocketChannelClient::didConnect):
+ (WebCore::WebSocketChannelClient::didReceiveMessage):
+ (WebCore::WebSocketChannelClient::didReceiveBinaryData):
+ (WebCore::WebSocketChannelClient::didReceiveMessageError):
+ (WebCore::WebSocketChannelClient::didUpdateBufferedAmount):
+ (WebCore::WebSocketChannelClient::didStartClosingHandshake):
+ (WebCore::WebSocketChannelClient::didClose):
+ (WebCore::WebSocketChannelClient::WebSocketChannelClient):
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::send):
+ (WebCore::WorkerThreadableWebSocketChannel::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+ * platform/network/BlobData.cpp:
+ (WebCore::BlobData::appendData):
+ (WebCore::BlobData::appendFile):
+ * platform/network/BlobData.h:
+ (WebCore::BlobDataItem::BlobDataItem):
+ * platform/network/BlobRegistry.h:
+ * platform/network/BlobRegistryImpl.cpp:
+ (WebCore::BlobRegistryImpl::appendStorageItems):
+ (WebCore::BlobRegistryImpl::registerFileBlobURL):
+ (WebCore::BlobRegistryImpl::registerBlobURL):
+ (WebCore::BlobRegistryImpl::registerBlobURLOptionallyFileBacked):
+ (WebCore::BlobRegistryImpl::registerBlobURLForSlice):
+ * platform/network/BlobRegistryImpl.h:
+ * platform/network/SocketStreamHandleBase.cpp:
+ (WebCore::SocketStreamHandleBase::send):
+ (WebCore::SocketStreamHandleBase::disconnect):
+ (WebCore::SocketStreamHandleBase::sendPendingData):
+ * platform/network/SocketStreamHandleBase.h:
+ * platform/network/SocketStreamHandleClient.h:
+ (WebCore::SocketStreamHandleClient::~SocketStreamHandleClient):
+ (WebCore::SocketStreamHandleClient::willOpenSocketStream):
+ (WebCore::SocketStreamHandleClient::didOpenSocketStream):
+ (WebCore::SocketStreamHandleClient::didCloseSocketStream):
+ (WebCore::SocketStreamHandleClient::didReceiveSocketStreamData):
+ (WebCore::SocketStreamHandleClient::didUpdateBufferedAmount):
+ (WebCore::SocketStreamHandleClient::didFailSocketStream):
+ (WebCore::SocketStreamHandleClient::didReceiveAuthenticationChallenge): Deleted.
+ (WebCore::SocketStreamHandleClient::didCancelAuthenticationChallenge): Deleted.
+ * platform/network/cf/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ (WebCore::SocketStreamHandle::refAuthenticationClient): Deleted.
+ (WebCore::SocketStreamHandle::derefAuthenticationClient): Deleted.
+ * 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):
+ (WebCore::SocketStreamHandle::receivedCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedCancellation): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
+ (WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ * platform/network/curl/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::SocketData::SocketData):
+ * platform/network/curl/SocketStreamHandleCurl.cpp:
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::readData):
+ (WebCore::SocketStreamHandle::didReceiveData):
+ (WebCore::SocketStreamHandle::didOpenSocket):
+ (WebCore::SocketStreamHandle::createCopy):
+ (WebCore::SocketStreamHandle::didReceiveAuthenticationChallenge): Deleted.
+ (WebCore::SocketStreamHandle::receivedCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedCancellation): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
+ (WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
+ * platform/network/soup/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::getHandleFromId):
+ (WebCore::deactivateHandle):
+ (WebCore::activateHandle):
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::~SocketStreamHandle):
+ (WebCore::SocketStreamHandle::connected):
+ (WebCore::SocketStreamHandle::readBytes):
+ (WebCore::SocketStreamHandle::platformSend):
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
+ (WebCore::SocketStreamHandle::didReceiveAuthenticationChallenge): Deleted.
+ (WebCore::SocketStreamHandle::receivedCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential): Deleted.
+ (WebCore::SocketStreamHandle::receivedCancellation): Deleted.
+ (WebCore::SocketStreamHandle::receivedRequestToPerformDefaultHandling): Deleted.
+ (WebCore::SocketStreamHandle::receivedChallengeRejection): Deleted.
+
</ins><span class="cx"> 2016-06-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201815.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> virtual SendResult send(const String& message) = 0;
</span><span class="cx"> virtual SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) = 0;
</span><span class="cx"> virtual SendResult send(Blob&) = 0;
</span><del>- virtual unsigned long bufferedAmount() const = 0;
</del><ins>+ virtual unsigned bufferedAmount() const = 0;
</ins><span class="cx"> virtual void close(int code, const String& reason) = 0;
</span><span class="cx"> // Log the reason text and close the connection. Will call didClose().
</span><span class="cx"> virtual void fail(const String& reason) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -136,12 +136,12 @@
</span><span class="cx"> m_syncMethodDone = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long ThreadableWebSocketChannelClientWrapper::bufferedAmount() const
</del><ins>+unsigned ThreadableWebSocketChannelClientWrapper::bufferedAmount() const
</ins><span class="cx"> {
</span><span class="cx"> return m_bufferedAmount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::setBufferedAmount(unsigned long bufferedAmount)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::setBufferedAmount(unsigned bufferedAmount)
</ins><span class="cx"> {
</span><span class="cx"> m_bufferedAmount = bufferedAmount;
</span><span class="cx"> m_syncMethodDone = true;
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned long bufferedAmount)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned bufferedAmount)
</ins><span class="cx"> {
</span><span class="cx"> m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, protectedThis = Ref<ThreadableWebSocketChannelClientWrapper>(*this), bufferedAmount] (ScriptExecutionContext&) {
</span><span class="cx"> if (m_client)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didClose(unsigned unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([this, protectedThis = Ref<ThreadableWebSocketChannelClientWrapper>(*this), unhandledBufferedAmount, closingHandshakeCompletion, code, reason = reason.isolatedCopy()] (ScriptExecutionContext&) {
</span><span class="cx"> if (m_client)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -71,17 +71,17 @@
</span><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult() const;
</span><span class="cx"> void setSendRequestResult(ThreadableWebSocketChannel::SendResult);
</span><span class="cx">
</span><del>- unsigned long bufferedAmount() const;
- void setBufferedAmount(unsigned long);
</del><ins>+ unsigned bufferedAmount() const;
+ void setBufferedAmount(unsigned);
</ins><span class="cx">
</span><span class="cx"> void clearClient();
</span><span class="cx">
</span><span class="cx"> void didConnect();
</span><span class="cx"> void didReceiveMessage(const String& message);
</span><span class="cx"> void didReceiveBinaryData(Vector<uint8_t>&&);
</span><del>- void didUpdateBufferedAmount(unsigned long bufferedAmount);
</del><ins>+ void didUpdateBufferedAmount(unsigned bufferedAmount);
</ins><span class="cx"> void didStartClosingHandshake();
</span><del>- void didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
</del><ins>+ void didClose(unsigned unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
</ins><span class="cx"> void didReceiveMessageError();
</span><span class="cx">
</span><span class="cx"> void suspend();
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> Vector<UChar> m_subprotocol;
</span><span class="cx"> Vector<UChar> m_extensions;
</span><span class="cx"> ThreadableWebSocketChannel::SendResult m_sendRequestResult;
</span><del>- unsigned long m_bufferedAmount;
</del><ins>+ unsigned m_bufferedAmount;
</ins><span class="cx"> bool m_suspended;
</span><span class="cx"> Vector<std::unique_ptr<ScriptExecutionContext::Task>> m_pendingTasks;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned long saturateAdd(unsigned long a, unsigned long b)
</del><ins>+static unsigned saturateAdd(unsigned a, unsigned b)
</ins><span class="cx"> {
</span><del>- if (std::numeric_limits<unsigned long>::max() - a < b)
- return std::numeric_limits<unsigned long>::max();
</del><ins>+ if (std::numeric_limits<unsigned>::max() - a < b)
+ return std::numeric_limits<unsigned>::max();
</ins><span class="cx"> return a + b;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_state == CLOSING || m_state == CLOSED) {
</span><del>- unsigned long payloadSize = static_cast<unsigned long>(binaryData.size());
</del><ins>+ unsigned payloadSize = static_cast<unsigned>(binaryData.size());
</ins><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, payloadSize);
</span><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, getFramingOverhead(payloadSize));
</span><span class="cx"> return;
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> return m_state;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long WebSocket::bufferedAmount() const
</del><ins>+unsigned WebSocket::bufferedAmount() const
</ins><span class="cx"> {
</span><span class="cx"> return saturateAdd(m_bufferedAmount, m_bufferedAmountAfterClose);
</span><span class="cx"> }
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx">
</span><span class="cx"> void WebSocket::didReceiveBinaryData(Vector<uint8_t>&& binaryData)
</span><span class="cx"> {
</span><del>- LOG(Network, "WebSocket %p didReceiveBinaryData() %lu byte binary message", this, static_cast<unsigned long>(binaryData.size()));
</del><ins>+ LOG(Network, "WebSocket %p didReceiveBinaryData() %u byte binary message", this, static_cast<unsigned>(binaryData.size()));
</ins><span class="cx"> switch (m_binaryType) {
</span><span class="cx"> case BinaryTypeBlob:
</span><span class="cx"> // FIXME: We just received the data from NetworkProcess, and are sending it back. This is inefficient.
</span><span class="lines">@@ -586,9 +586,9 @@
</span><span class="cx"> dispatchOrQueueErrorEvent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::didUpdateBufferedAmount(unsigned long bufferedAmount)
</del><ins>+void WebSocket::didUpdateBufferedAmount(unsigned bufferedAmount)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocket %p didUpdateBufferedAmount() New bufferedAmount is %lu", this, bufferedAmount);
</del><ins>+ LOG(Network, "WebSocket %p didUpdateBufferedAmount() New bufferedAmount is %u", this, bufferedAmount);
</ins><span class="cx"> if (m_state == CLOSED)
</span><span class="cx"> return;
</span><span class="cx"> m_bufferedAmount = bufferedAmount;
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> m_state = CLOSING;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</del><ins>+void WebSocket::didClose(unsigned unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocket %p didClose()", this);
</span><span class="cx"> if (!m_channel)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> const URL& url() const;
</span><span class="cx"> State readyState() const;
</span><del>- unsigned long bufferedAmount() const;
</del><ins>+ unsigned bufferedAmount() const;
</ins><span class="cx">
</span><span class="cx"> String protocol() const;
</span><span class="cx"> String extensions() const;
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> void didReceiveMessage(const String& message) override;
</span><span class="cx"> void didReceiveBinaryData(Vector<uint8_t>&&) override;
</span><span class="cx"> void didReceiveMessageError() override;
</span><del>- void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
</del><ins>+ void didUpdateBufferedAmount(unsigned bufferedAmount) override;
</ins><span class="cx"> void didStartClosingHandshake() override;
</span><del>- void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
</del><ins>+ void didClose(unsigned unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebSocket(ScriptExecutionContext&);
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx">
</span><span class="cx"> State m_state;
</span><span class="cx"> URL m_url;
</span><del>- unsigned long m_bufferedAmount;
- unsigned long m_bufferedAmountAfterClose;
</del><ins>+ unsigned m_bufferedAmount;
+ unsigned m_bufferedAmountAfterClose;
</ins><span class="cx"> BinaryType m_binaryType;
</span><span class="cx"> String m_subprotocol;
</span><span class="cx"> String m_extensions;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -68,23 +68,12 @@
</span><span class="cx"> : m_document(&document)
</span><span class="cx"> , m_client(&client)
</span><span class="cx"> , m_resumeTimer(*this, &WebSocketChannel::resumeTimerFired)
</span><del>- , m_suspended(false)
- , m_closing(false)
- , m_receivedClosingHandshake(false)
</del><span class="cx"> , m_closingTimer(*this, &WebSocketChannel::closingTimerFired)
</span><del>- , m_closed(false)
- , m_shouldDiscardReceivedData(false)
- , m_unhandledBufferedAmount(0)
- , m_identifier(0)
- , m_hasContinuousFrame(false)
- , m_closeEventCode(CloseEventCodeAbnormalClosure)
- , m_outgoingFrameQueueStatus(OutgoingFrameQueueOpen)
- , m_blobLoaderStatus(BlobLoaderNotStarted)
</del><span class="cx"> {
</span><span class="cx"> if (Page* page = document.page())
</span><span class="cx"> m_identifier = page->progress().createUniqueIdentifier();
</span><span class="cx">
</span><del>- LOG(Network, "WebSocketChannel %p ctor, identifier %lu", this, m_identifier);
</del><ins>+ LOG(Network, "WebSocketChannel %p ctor, identifier %u", this, m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebSocketChannel::~WebSocketChannel()
</span><span class="lines">@@ -174,7 +163,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long WebSocketChannel::bufferedAmount() const
</del><ins>+unsigned WebSocketChannel::bufferedAmount() const
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p bufferedAmount()", this);
</span><span class="cx"> ASSERT(m_handle);
</span><span class="lines">@@ -253,30 +242,30 @@
</span><span class="cx"> m_resumeTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::willOpenSocketStream(SocketStreamHandle*)
</del><ins>+void WebSocketChannel::willOpenSocketStream(SocketStreamHandle&)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p willOpenSocketStream()", this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didOpenSocketStream(SocketStreamHandle* handle)
</del><ins>+void WebSocketChannel::didOpenSocketStream(SocketStreamHandle& handle)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didOpenSocketStream()", this);
</span><del>- ASSERT(handle == m_handle);
</del><ins>+ ASSERT(&handle == m_handle);
</ins><span class="cx"> if (!m_document)
</span><span class="cx"> return;
</span><span class="cx"> if (m_identifier)
</span><span class="cx"> InspectorInstrumentation::willSendWebSocketHandshakeRequest(m_document, m_identifier, m_handshake->clientHandshakeRequest());
</span><span class="cx"> CString handshakeMessage = m_handshake->clientHandshakeMessage();
</span><del>- if (!handle->send(handshakeMessage.data(), handshakeMessage.length()))
</del><ins>+ if (!handle.send(handshakeMessage.data(), handshakeMessage.length()))
</ins><span class="cx"> fail("Failed to send WebSocket handshake.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didCloseSocketStream(SocketStreamHandle* handle)
</del><ins>+void WebSocketChannel::didCloseSocketStream(SocketStreamHandle& handle)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didCloseSocketStream()", this);
</span><span class="cx"> if (m_identifier && m_document)
</span><span class="cx"> InspectorInstrumentation::didCloseWebSocket(m_document, m_identifier);
</span><del>- ASSERT_UNUSED(handle, handle == m_handle || !m_handle);
</del><ins>+ ASSERT_UNUSED(handle, &handle == m_handle || !m_handle);
</ins><span class="cx"> m_closed = true;
</span><span class="cx"> if (m_closingTimer.isActive())
</span><span class="cx"> m_closingTimer.stop();
</span><span class="lines">@@ -296,21 +285,21 @@
</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, int len)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didReceiveSocketStreamData() Received %d bytes", this, len);
</span><span class="cx"> Ref<WebSocketChannel> protectedThis(*this); // The client can close the channel, potentially removing the last reference.
</span><del>- ASSERT(handle == m_handle);
</del><ins>+ ASSERT(&handle == m_handle);
</ins><span class="cx"> if (!m_document) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (len <= 0) {
</span><del>- handle->disconnect();
</del><ins>+ handle.disconnect();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_client) {
</span><span class="cx"> m_shouldDiscardReceivedData = true;
</span><del>- handle->disconnect();
</del><ins>+ handle.disconnect();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_shouldDiscardReceivedData)
</span><span class="lines">@@ -325,16 +314,16 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount)
</del><ins>+void WebSocketChannel::didUpdateBufferedAmount(SocketStreamHandle&, size_t bufferedAmount)
</ins><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didUpdateBufferedAmount(bufferedAmount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didFailSocketStream(SocketStreamHandle* handle, const SocketStreamError& error)
</del><ins>+void WebSocketChannel::didFailSocketStream(SocketStreamHandle& handle, const SocketStreamError& error)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didFailSocketStream()", this);
</span><del>- ASSERT(handle == m_handle || !m_handle);
</del><ins>+ ASSERT(&handle == m_handle || !m_handle);
</ins><span class="cx"> if (m_document) {
</span><span class="cx"> String message;
</span><span class="cx"> if (error.isNull())
</span><span class="lines">@@ -347,17 +336,9 @@
</span><span class="cx"> m_document->addConsoleMessage(MessageSource::Network, MessageLevel::Error, message);
</span><span class="cx"> }
</span><span class="cx"> m_shouldDiscardReceivedData = true;
</span><del>- handle->disconnect();
</del><ins>+ handle.disconnect();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
-{
-}
-
-void WebSocketChannel::didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&)
-{
-}
-
</del><span class="cx"> void WebSocketChannel::didStartLoading()
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p didStartLoading()", this);
</span><span class="lines">@@ -397,7 +378,7 @@
</span><span class="cx"> {
</span><span class="cx"> size_t newBufferSize = m_buffer.size() + len;
</span><span class="cx"> if (newBufferSize < m_buffer.size()) {
</span><del>- LOG(Network, "WebSocketChannel %p appendToBuffer() Buffer overflow (%lu bytes already in receive buffer and appending %lu bytes)", this, static_cast<unsigned long>(m_buffer.size()), static_cast<unsigned long>(len));
</del><ins>+ LOG(Network, "WebSocketChannel %p appendToBuffer() Buffer overflow (%u bytes already in receive buffer and appending %u bytes)", this, static_cast<unsigned>(m_buffer.size()), static_cast<unsigned>(len));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> m_buffer.append(data, len);
</span><span class="lines">@@ -416,7 +397,7 @@
</span><span class="cx"> ASSERT(!m_suspended);
</span><span class="cx"> ASSERT(m_client);
</span><span class="cx"> ASSERT(!m_buffer.isEmpty());
</span><del>- LOG(Network, "WebSocketChannel %p processBuffer() Receive buffer has %lu bytes", this, static_cast<unsigned long>(m_buffer.size()));
</del><ins>+ LOG(Network, "WebSocketChannel %p processBuffer() Receive buffer has %u bytes", this, static_cast<unsigned>(m_buffer.size()));
</ins><span class="cx">
</span><span class="cx"> if (m_shouldDiscardReceivedData)
</span><span class="cx"> return false;
</span><span class="lines">@@ -445,7 +426,7 @@
</span><span class="cx"> LOG(Network, "WebSocketChannel %p Connected", this);
</span><span class="cx"> skipBuffer(headerLength);
</span><span class="cx"> m_client->didConnect();
</span><del>- LOG(Network, "WebSocketChannel %p %lu bytes remaining in m_buffer", this, static_cast<unsigned long>(m_buffer.size()));
</del><ins>+ LOG(Network, "WebSocketChannel %p %u bytes remaining in m_buffer", this, static_cast<unsigned>(m_buffer.size()));
</ins><span class="cx"> return !m_buffer.isEmpty();
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_handshake->mode() == WebSocketHandshake::Failed);
</span><span class="lines">@@ -468,7 +449,7 @@
</span><span class="cx"> if (!processBuffer())
</span><span class="cx"> break;
</span><span class="cx"> if (!m_suspended && m_client && m_closed && m_handle)
</span><del>- didCloseSocketStream(m_handle.get());
</del><ins>+ didCloseSocketStream(*m_handle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocketChannel::startClosingHandshake(int code, const String& reason)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -28,8 +28,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 WebSocketChannel_h
-#define WebSocketChannel_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx">
</span><span class="lines">@@ -39,7 +38,6 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "WebSocketDeflateFramer.h"
</span><span class="cx"> #include "WebSocketFrame.h"
</span><del>-#include "WebSocketHandshake.h"
</del><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -54,6 +52,7 @@
</span><span class="cx"> class SocketStreamHandle;
</span><span class="cx"> class SocketStreamError;
</span><span class="cx"> class WebSocketChannelClient;
</span><ins>+class WebSocketHandshake;
</ins><span class="cx">
</span><span class="cx"> class WebSocketChannel : public RefCounted<WebSocketChannel>, public SocketStreamHandleClient, public ThreadableWebSocketChannel, public FileReaderLoaderClient
</span><span class="cx"> {
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const String& message) override;
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) override;
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(Blob&) override;
</span><del>- unsigned long bufferedAmount() const override;
</del><ins>+ unsigned bufferedAmount() const override;
</ins><span class="cx"> void close(int code, const String& reason) override; // Start closing handshake.
</span><span class="cx"> void fail(const String& reason) override;
</span><span class="cx"> void disconnect() override;
</span><span class="lines">@@ -80,14 +79,12 @@
</span><span class="cx"> void resume() override;
</span><span class="cx">
</span><span class="cx"> // SocketStreamHandleClient functions.
</span><del>- void willOpenSocketStream(SocketStreamHandle*) override;
- 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;
- void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) override;
- void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) override;
</del><ins>+ void willOpenSocketStream(SocketStreamHandle&) override;
+ 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;
</ins><span class="cx">
</span><span class="cx"> enum CloseEventCode {
</span><span class="cx"> CloseEventCodeNotSpecified = -1,
</span><span class="lines">@@ -191,29 +188,29 @@
</span><span class="cx"> Vector<char> m_buffer;
</span><span class="cx">
</span><span class="cx"> Timer m_resumeTimer;
</span><del>- bool m_suspended;
- bool m_closing;
- bool m_receivedClosingHandshake;
</del><ins>+ bool m_suspended { false };
+ bool m_closing { false };
+ bool m_receivedClosingHandshake { false };
</ins><span class="cx"> Timer m_closingTimer;
</span><del>- bool m_closed;
- bool m_shouldDiscardReceivedData;
- unsigned long m_unhandledBufferedAmount;
</del><ins>+ bool m_closed { false };
+ bool m_shouldDiscardReceivedData { false };
+ unsigned m_unhandledBufferedAmount { 0 };
</ins><span class="cx">
</span><del>- unsigned long m_identifier; // m_identifier == 0 means that we could not obtain a valid identifier.
</del><ins>+ unsigned m_identifier { 0 }; // m_identifier == 0 means that we could not obtain a valid identifier.
</ins><span class="cx">
</span><span class="cx"> // Private members only for hybi-10 protocol.
</span><del>- bool m_hasContinuousFrame;
</del><ins>+ bool m_hasContinuousFrame { false };
</ins><span class="cx"> WebSocketFrame::OpCode m_continuousFrameOpCode;
</span><span class="cx"> Vector<uint8_t> m_continuousFrameData;
</span><del>- unsigned short m_closeEventCode;
</del><ins>+ unsigned short m_closeEventCode { CloseEventCodeAbnormalClosure };
</ins><span class="cx"> String m_closeEventReason;
</span><span class="cx">
</span><span class="cx"> Deque<std::unique_ptr<QueuedFrame>> m_outgoingFrameQueue;
</span><del>- OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;
</del><ins>+ OutgoingFrameQueueStatus m_outgoingFrameQueueStatus { OutgoingFrameQueueOpen };
</ins><span class="cx">
</span><span class="cx"> // FIXME: Load two or more Blobs simultaneously for better performance.
</span><span class="cx"> std::unique_ptr<FileReaderLoader> m_blobLoader;
</span><del>- BlobLoaderStatus m_blobLoaderStatus;
</del><ins>+ BlobLoaderStatus m_blobLoaderStatus { BlobLoaderNotStarted };
</ins><span class="cx">
</span><span class="cx"> WebSocketDeflateFramer m_deflateFramer;
</span><span class="cx"> };
</span><span class="lines">@@ -221,5 +218,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_SOCKETS)
</span><del>-
-#endif // WebSocketChannel_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -28,8 +28,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 WebSocketChannelClient_h
-#define WebSocketChannelClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx">
</span><span class="lines">@@ -38,27 +37,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class WebSocketChannelClient {
- public:
- virtual ~WebSocketChannelClient() { }
- virtual void didConnect() { }
- virtual void didReceiveMessage(const String&) { }
- virtual void didReceiveBinaryData(Vector<uint8_t>&&) { }
- virtual void didReceiveMessageError() { }
- virtual void didUpdateBufferedAmount(unsigned long /* bufferedAmount */) { }
- virtual void didStartClosingHandshake() { }
- enum ClosingHandshakeCompletionStatus {
- ClosingHandshakeIncomplete,
- ClosingHandshakeComplete
- };
- virtual void didClose(unsigned long /* unhandledBufferedAmount */, ClosingHandshakeCompletionStatus, unsigned short /* code */, const String& /* reason */) { }
-
- protected:
- WebSocketChannelClient() { }
</del><ins>+class WebSocketChannelClient {
+public:
+ virtual ~WebSocketChannelClient() { }
+ virtual void didConnect() { }
+ virtual void didReceiveMessage(const String&) { }
+ virtual void didReceiveBinaryData(Vector<uint8_t>&&) { }
+ virtual void didReceiveMessageError() { }
+ virtual void didUpdateBufferedAmount(unsigned /* bufferedAmount */) { }
+ virtual void didStartClosingHandshake() { }
+ enum ClosingHandshakeCompletionStatus {
+ ClosingHandshakeIncomplete,
+ ClosingHandshakeComplete
</ins><span class="cx"> };
</span><ins>+ virtual void didClose(unsigned /* unhandledBufferedAmount */, ClosingHandshakeCompletionStatus, unsigned short /* code */, const String& /* reason */) { }
</ins><span class="cx">
</span><ins>+protected:
+ WebSocketChannelClient() { }
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_SOCKETS)
</span><del>-
-#endif // WebSocketChannelClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> return m_bridge->send(binaryData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long WorkerThreadableWebSocketChannel::bufferedAmount() const
</del><ins>+unsigned WorkerThreadableWebSocketChannel::bufferedAmount() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_bridge)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> if (!m_mainWebSocketChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- unsigned long bufferedAmount = m_mainWebSocketChannel->bufferedAmount();
</del><ins>+ unsigned bufferedAmount = m_mainWebSocketChannel->bufferedAmount();
</ins><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = m_workerClientWrapper.copyRef(), bufferedAmount](ScriptExecutionContext& context) mutable {
</span><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->setBufferedAmount(bufferedAmount);
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount(unsigned long bufferedAmount)
</del><ins>+void WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount(unsigned bufferedAmount)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::Peer::didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</del><ins>+void WorkerThreadableWebSocketChannel::Peer::didClose(unsigned unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_mainWebSocketChannel = nullptr;
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> return m_workerClientWrapper->sendRequestResult();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long WorkerThreadableWebSocketChannel::Bridge::bufferedAmount()
</del><ins>+unsigned WorkerThreadableWebSocketChannel::Bridge::bufferedAmount()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const String& message) override;
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) override;
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(Blob&) override;
</span><del>- unsigned long bufferedAmount() const override;
</del><ins>+ unsigned bufferedAmount() const override;
</ins><span class="cx"> void close(int code, const String& reason) override;
</span><span class="cx"> void fail(const String& reason) override;
</span><span class="cx"> void disconnect() override; // Will suppress didClose().
</span><span class="lines">@@ -96,9 +96,9 @@
</span><span class="cx"> void didConnect() override;
</span><span class="cx"> void didReceiveMessage(const String& message) override;
</span><span class="cx"> void didReceiveBinaryData(Vector<uint8_t>&&) override;
</span><del>- void didUpdateBufferedAmount(unsigned long bufferedAmount) override;
</del><ins>+ void didUpdateBufferedAmount(unsigned bufferedAmount) override;
</ins><span class="cx"> void didStartClosingHandshake() override;
</span><del>- void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
</del><ins>+ void didClose(unsigned unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
</ins><span class="cx"> void didReceiveMessageError() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const String& message);
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(Blob&);
</span><del>- unsigned long bufferedAmount();
</del><ins>+ unsigned bufferedAmount();
</ins><span class="cx"> void close(int code, const String& reason);
</span><span class="cx"> void fail(const String& reason);
</span><span class="cx"> void disconnect();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/BlobData.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx"> m_items.append(BlobDataItem(data, offset, length));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobData::appendFile(PassRefPtr<BlobDataFileReference> file)
</del><ins>+void BlobData::appendFile(Ref<BlobDataFileReference>&& file)
</ins><span class="cx"> {
</span><span class="cx"> file->startTrackingModifications();
</span><del>- m_items.append(BlobDataItem(file));
</del><ins>+ m_items.append(BlobDataItem(WTFMove(file)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobData::appendFile(BlobDataFileReference* file, long long offset, long long length)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/BlobData.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class BlobData;
</span><span class="cx">
</span><del>- explicit BlobDataItem(PassRefPtr<BlobDataFileReference> file)
</del><ins>+ explicit BlobDataItem(Ref<BlobDataFileReference>&& file)
</ins><span class="cx"> : m_type(Type::File)
</span><del>- , m_file(file)
</del><ins>+ , m_file(WTFMove(file))
</ins><span class="cx"> , m_offset(0)
</span><span class="cx"> , m_length(toEndOfFile)
</span><span class="cx"> {
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void swapItems(BlobDataItemList&);
</span><span class="cx">
</span><span class="cx"> void appendData(const ThreadSafeDataBuffer&);
</span><del>- void appendFile(PassRefPtr<BlobDataFileReference>);
</del><ins>+ void appendFile(Ref<BlobDataFileReference>&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class BlobRegistryImpl;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -28,8 +28,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 BlobRegistry_h
-#define BlobRegistry_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -50,7 +49,7 @@
</span><span class="cx"> public:
</span><span class="cx">
</span><span class="cx"> // Registers a blob URL referring to the specified file.
</span><del>- virtual void registerFileBlobURL(const URL&, RefPtr<BlobDataFileReference>&&, const String& contentType) = 0;
</del><ins>+ virtual void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& contentType) = 0;
</ins><span class="cx">
</span><span class="cx"> // Registers a blob URL referring to the specified blob data.
</span><span class="cx"> virtual void registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) = 0;
</span><span class="lines">@@ -77,5 +76,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // BlobRegistry_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -110,15 +110,14 @@
</span><span class="cx"> ASSERT(!length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobRegistryImpl::registerFileBlobURL(const URL& url, RefPtr<BlobDataFileReference>&& file, const String& contentType)
</del><ins>+void BlobRegistryImpl::registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& file, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> registerBlobResourceHandleConstructor();
</span><span class="cx">
</span><del>- RefPtr<BlobData> blobData = BlobData::create(contentType);
-
- blobData->appendFile(file);
- m_blobs.set(url.string(), blobData.release());
</del><ins>+ auto blobData = BlobData::create(contentType);
+ blobData->appendFile(WTFMove(file));
+ m_blobs.set(url.string(), WTFMove(blobData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryImpl::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</span><span class="lines">@@ -171,13 +170,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (file == nullptr || file->path().isEmpty())
</del><ins>+ if (!file || file->path().isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<BlobData> backingFile = BlobData::create({ });
- backingFile->appendFile(WTFMove(file));
</del><ins>+ auto backingFile = BlobData::create({ });
+ backingFile->appendFile(file.releaseNonNull());
</ins><span class="cx">
</span><del>- m_blobs.set(url.string(), backingFile.release());
</del><ins>+ m_blobs.set(url.string(), WTFMove(backingFile));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryImpl::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void appendStorageItems(BlobData*, const BlobDataItemList&, long long offset, long long length);
</span><span class="cx">
</span><del>- void registerFileBlobURL(const URL&, RefPtr<BlobDataFileReference>&&, const String& contentType) override;
</del><ins>+ void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& contentType) override;
</ins><span class="cx"> void registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) override;
</span><span class="cx"> void registerBlobURL(const URL&, const URL& srcURL) override;
</span><span class="cx"> void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, RefPtr<BlobDataFileReference>&&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleBase.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_buffer.append(data, length);
</span><span class="cx"> if (m_client)
</span><del>- 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">@@ -76,7 +76,7 @@
</span><span class="cx"> if (bytesWritten < length) {
</span><span class="cx"> m_buffer.append(data + bytesWritten, length - bytesWritten);
</span><span class="cx"> if (m_client)
</span><del>- 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">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandleBase::disconnect()
</span><span class="cx"> {
</span><del>- Ref<SocketStreamHandle> protect(*static_cast<SocketStreamHandle*>(this)); // platformClose calls the client, which may make the handle get deallocated immediately.
</del><ins>+ Ref<SocketStreamHandle> protect(static_cast<SocketStreamHandle&>(*this)); // platformClose calls the client, which may make the handle get deallocated immediately.
</ins><span class="cx">
</span><span class="cx"> platformClose();
</span><span class="cx"> m_state = Closed;
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> m_buffer.consume(bytesWritten);
</span><span class="cx"> } while (!pending && !m_buffer.isEmpty());
</span><span class="cx"> if (m_client)
</span><del>- 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 (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleBase.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -29,11 +29,9 @@
</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 SocketStreamHandleBase_h
-#define SocketStreamHandleBase_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "URL.h"
</span><del>-
</del><span class="cx"> #include <wtf/StreamBuffer.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -69,5 +67,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // SocketStreamHandleBase_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/SocketStreamHandleClient.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -29,33 +29,24 @@
</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 SocketStreamHandleClient_h
-#define SocketStreamHandleClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class AuthenticationChallenge;
- class URL;
- class SocketStreamError;
- class SocketStreamHandle;
</del><ins>+class SocketStreamError;
+class SocketStreamHandle;
</ins><span class="cx">
</span><del>- class SocketStreamHandleClient {
- public:
- virtual ~SocketStreamHandleClient() { }
</del><ins>+class SocketStreamHandleClient {
+public:
+ virtual ~SocketStreamHandleClient() { }
</ins><span class="cx">
</span><del>- virtual void willOpenSocketStream(SocketStreamHandle*) { }
- virtual void didOpenSocketStream(SocketStreamHandle*) { }
- virtual void didCloseSocketStream(SocketStreamHandle*) { }
- virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char* /*data*/, int /*length*/) { }
- virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t /*bufferedAmount*/) { }
</del><ins>+ virtual void willOpenSocketStream(SocketStreamHandle&) { }
+ virtual void didOpenSocketStream(SocketStreamHandle&) { }
+ virtual void didCloseSocketStream(SocketStreamHandle&) { }
+ virtual void didReceiveSocketStreamData(SocketStreamHandle&, const char* /*data*/, int /*length*/) { }
+ virtual void didUpdateBufferedAmount(SocketStreamHandle&, size_t /*bufferedAmount*/) { }
</ins><span class="cx">
</span><del>- virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&) { }
</del><ins>+ virtual void didFailSocketStream(SocketStreamHandle&, const SocketStreamError&) { }
+};
</ins><span class="cx">
</span><del>- // No authentication for streams per se, but proxy may ask for credentials.
- virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) { }
- virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) { }
- };
-
-} // namespace WebCore
-
-#endif // SocketStreamHandleClient_h
</del><ins>+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -29,10 +29,8 @@
</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 SocketStreamHandle_h
-#define SocketStreamHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include "AuthenticationClient.h"
</del><span class="cx"> #include "SocketStreamHandleBase.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -47,15 +45,12 @@
</span><span class="cx"> class ProtectionSpace;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><del>-class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase, public AuthenticationClient {
</del><ins>+class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<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><del>- using ThreadSafeRefCounted<SocketStreamHandle>::ref;
- using ThreadSafeRefCounted<SocketStreamHandle>::deref;
-
</del><span class="cx"> private:
</span><span class="cx"> virtual int platformSend(const char* data, int length);
</span><span class="cx"> virtual void platformClose();
</span><span class="lines">@@ -88,16 +83,6 @@
</span><span class="cx">
</span><span class="cx"> bool getStoredCONNECTProxyCredentials(const ProtectionSpace&, String& login, String& password);
</span><span class="cx">
</span><del>- // No authentication for streams per se, but proxy may ask for credentials.
- virtual void receivedCredential(const AuthenticationChallenge&, const Credential&);
- virtual void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&);
- virtual void receivedCancellation(const AuthenticationChallenge&);
- virtual void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&);
- virtual void receivedChallengeRejection(const AuthenticationChallenge&);
-
- virtual void refAuthenticationClient() { ref(); }
- virtual void derefAuthenticationClient() { deref(); }
-
</del><span class="cx"> enum ConnectingSubstate { New, ExecutingPACFile, WaitingForCredentials, WaitingForConnect, Connected };
</span><span class="cx"> ConnectingSubstate m_connectingSubstate;
</span><span class="cx">
</span><span class="lines">@@ -117,5 +102,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // SocketStreamHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</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,14 +505,14 @@
</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="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,29 +682,9 @@
</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><del>-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)
-{
-}
-
-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
-{
-}
-
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&)
-{
-}
-
-void SocketStreamHandle::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
-{
-}
-
-void SocketStreamHandle::receivedChallengeRejection(const AuthenticationChallenge&)
-{
-}
-
</del><span class="cx"> unsigned short SocketStreamHandle::port() const
</span><span class="cx"> {
</span><span class="cx"> if (unsigned short urlPort = m_url.port())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx"> #include "ResourceHandleManager.h"
</span><span class="cx"> #include "SSLHandle.h"
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) && USE(CF)
-#include <wtf/PassRefPtr.h>
-#include <wtf/RetainPtr.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class WebCoreSynchronousLoader : public ResourceHandleClient {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -29,8 +29,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 SocketStreamHandle_h
-#define SocketStreamHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "SocketStreamHandleBase.h"
</span><span class="cx">
</span><span class="lines">@@ -47,8 +46,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AuthenticationChallenge;
-class Credential;
</del><span class="cx"> class NetworkingContext;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><span class="lines">@@ -76,14 +73,6 @@
</span><span class="cx">
</span><span class="cx"> static std::unique_ptr<char[]> createCopy(const char* data, int length);
</span><span class="cx">
</span><del>- // No authentication for streams per se, but proxy may ask for credentials.
- void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
- void receivedCredential(const AuthenticationChallenge&, const Credential&);
- void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&);
- void receivedCancellation(const AuthenticationChallenge&);
- void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&);
- void receivedChallengeRejection(const AuthenticationChallenge&);
-
</del><span class="cx"> struct SocketData {
</span><span class="cx"> SocketData(std::unique_ptr<char[]>&& source, int length)
</span><span class="cx"> {
</span><span class="lines">@@ -111,5 +100,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // SocketStreamHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #if USE(CURL)
</span><span class="cx">
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NotImplemented.h"
</del><span class="cx"> #include "SocketStreamHandleClient.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -82,7 +81,7 @@
</span><span class="cx"> stopThread();
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><del>- 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">@@ -258,7 +257,7 @@
</span><span class="cx"> for (auto& socketData : receiveData) {
</span><span class="cx"> if (socketData.size > 0) {
</span><span class="cx"> if (m_client && state() == Open)
</span><del>- m_client->didReceiveSocketStreamData(this, socketData.data.get(), socketData.size);
</del><ins>+ 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">@@ -271,7 +270,7 @@
</span><span class="cx"> m_state = Open;
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><del>- 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 class="lines">@@ -282,36 +281,6 @@
</span><span class="cx"> return WTFMove(copy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedChallengeRejection(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -43,15 +43,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class AuthenticationChallenge;
- class Credential;
</del><span class="cx"> class NetworkingContext;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext&, bool) { return adoptRef(new SocketStreamHandle(url, client)); }
- static PassRefPtr<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"> void connected(GSocketConnection*, GError*);
</span><span class="lines">@@ -74,14 +72,6 @@
</span><span class="cx"> SocketStreamHandle(const URL&, SocketStreamHandleClient*);
</span><span class="cx"> SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient*);
</span><span class="cx">
</span><del>- // No authentication for streams per se, but proxy may ask for credentials.
- void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
- void receivedCredential(const AuthenticationChallenge&, const Credential&);
- void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&);
- void receivedCancellation(const AuthenticationChallenge&);
- void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&);
- void receivedChallengeRejection(const AuthenticationChallenge&);
-
</del><span class="cx"> void beginWaitingForSocketWritability();
</span><span class="cx"> void stopWaitingForSocketWritability();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NotImplemented.h"
</del><span class="cx"> #include "SocketStreamError.h"
</span><span class="cx"> #include "SocketStreamHandleClient.h"
</span><span class="cx">
</span><span class="lines">@@ -68,17 +67,17 @@
</span><span class="cx"> return gActiveHandles.get(id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void deactivateHandle(SocketStreamHandle* handle)
</del><ins>+static void deactivateHandle(SocketStreamHandle& handle)
</ins><span class="cx"> {
</span><del>- gActiveHandles.remove(handle->id());
</del><ins>+ gActiveHandles.remove(handle.id());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void* activateHandle(SocketStreamHandle* handle)
</del><ins>+static void* activateHandle(SocketStreamHandle& handle)
</ins><span class="cx"> {
</span><span class="cx"> // The first id cannot be 0, because it conflicts with the HashMap emptyValue.
</span><span class="cx"> static gint currentHandleId = 1;
</span><span class="cx"> void* id = GINT_TO_POINTER(currentHandleId++);
</span><del>- gActiveHandles.set(id, handle);
</del><ins>+ gActiveHandles.set(id, &handle);
</ins><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -88,7 +87,7 @@
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</span><span class="cx"> unsigned int port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
</span><span class="cx">
</span><del>- m_id = activateHandle(this);
</del><ins>+ m_id = activateHandle(*this);
</ins><span class="cx"> GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
</span><span class="cx"> if (url.protocolIs("wss"))
</span><span class="cx"> g_socket_client_set_tls(socketClient.get(), TRUE);
</span><span class="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> : SocketStreamHandleBase(URL(), client)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</span><del>- m_id = activateHandle(this);
</del><ins>+ m_id = activateHandle(*this);
</ins><span class="cx"> connected(socketConnection, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,14 +107,14 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p delete", this);
</span><span class="cx"> // If for some reason we were destroyed without closing, ensure that we are deactivated.
</span><del>- deactivateHandle(this);
- setClient(0);
</del><ins>+ deactivateHandle(*this);
+ setClient(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::connected(GSocketConnection* socketConnection, GError* error)
</span><span class="cx"> {
</span><span class="cx"> if (error) {
</span><del>- m_client->didFailSocketStream(this, SocketStreamError(error->code, error->message));
</del><ins>+ m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,13 +127,13 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), m_id);
</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::readBytes(signed long bytesRead, GError* error)
</span><span class="cx"> {
</span><span class="cx"> if (error) {
</span><del>- m_client->didFailSocketStream(this, SocketStreamError(error->code, error->message));
</del><ins>+ m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,8 +143,8 @@
</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);
- m_client->didReceiveSocketStreamData(this, m_readBuffer.get(), bytesRead);
</del><ins>+ Ref<SocketStreamHandle> protectedThis(*this);
+ m_client->didReceiveSocketStreamData(*this, m_readBuffer.get(), bytesRead);
</ins><span class="cx"> if (m_inputStream) // The client may have closed the connection.
</span><span class="cx"> g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, 0,
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), m_id);
</span><span class="lines">@@ -174,7 +173,7 @@
</span><span class="cx"> if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx"> else
</span><del>- m_client->didFailSocketStream(this, SocketStreamError(error->code, error->message));
</del><ins>+ m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -190,14 +189,14 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformClose", this);
</span><span class="cx"> // We remove this handle from the active handles list first, to disable all callbacks.
</span><del>- deactivateHandle(this);
</del><ins>+ deactivateHandle(*this);
</ins><span class="cx"> stopWaitingForSocketWritability();
</span><span class="cx">
</span><span class="cx"> if (m_socketConnection) {
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), 0, &error.outPtr());
</span><span class="cx"> if (error)
</span><del>- m_client->didFailSocketStream(this, SocketStreamError(error->code, error->message));
</del><ins>+ m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</ins><span class="cx"> m_socketConnection = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,39 +204,9 @@
</span><span class="cx"> m_inputStream = 0;
</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><del>-void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedChallengeRejection(const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
</del><span class="cx"> void SocketStreamHandle::beginWaitingForSocketWritability()
</span><span class="cx"> {
</span><span class="cx"> if (m_writeReadySource) // Already waiting.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-09 Alex Christensen <achristensen@webkit.org>
+
+ Clean up WebSocket code
+ https://bugs.webkit.org/show_bug.cgi?id=158551
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::registerFileBlobURL):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+
</ins><span class="cx"> 2016-06-09 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Update properties for UIWKTextInteractionAssistant
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, RefPtr<BlobDataFileReference>&& file, const String& contentType)
</del><ins>+void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, Ref<BlobDataFileReference>&& file, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> SandboxExtension::Handle extensionHandle;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (201879 => 201880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-09 20:09:21 UTC (rev 201879)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-09 20:10:30 UTC (rev 201880)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class BlobRegistryProxy final : public WebCore::BlobRegistry {
</span><span class="cx"> public:
</span><del>- void registerFileBlobURL(const WebCore::URL&, RefPtr<WebCore::BlobDataFileReference>&&, const String& contentType) override;
</del><ins>+ void registerFileBlobURL(const WebCore::URL&, Ref<WebCore::BlobDataFileReference>&&, const String& contentType) override;
</ins><span class="cx"> void registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType) override;
</span><span class="cx"> void registerBlobURL(const WebCore::URL&, const WebCore::URL& srcURL) override;
</span><span class="cx"> void registerBlobURLOptionallyFileBacked(const WebCore::URL&, const WebCore::URL& srcURL, RefPtr<WebCore::BlobDataFileReference>&&) override;
</span></span></pre>
</div>
</div>
</body>
</html>