<!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>[201761] 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/201761">201761</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-07 11:52:06 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize loading code
https://bugs.webkit.org/show_bug.cgi?id=158332
Reviewed by Darin Adler.
Source/WebCore:
No new tests, no change in behavior.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::cachedResourceContent):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::continueAfterContentPolicy):
* loader/FrameLoader.h:
* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::didReceiveData):
(WebCore::NetscapePlugInStreamLoader::didReceiveBuffer):
(WebCore::NetscapePlugInStreamLoader::didReceiveDataOrBuffer):
(WebCore::NetscapePlugInStreamLoader::didFinishLoading):
* loader/NetscapePlugInStreamLoader.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::deliverResponseAndData):
(WebCore::ResourceLoader::loadDataURL):
(WebCore::ResourceLoader::addDataOrBuffer):
(WebCore::ResourceLoader::clearResourceData):
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didReceiveBuffer):
(WebCore::ResourceLoader::didReceiveDataOrBuffer):
(WebCore::ResourceLoader::didFinishLoading):
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::wasCancelled):
(WebCore::ResourceLoader::options):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didReceiveData):
(WebCore::SubresourceLoader::didReceiveBuffer):
(WebCore::SubresourceLoader::didReceiveDataOrBuffer):
* loader/SubresourceLoader.h:
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::abort):
(WebCore::ApplicationCacheGroup::createResourceHandle):
* loader/appcache/ApplicationCacheGroup.h:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::addData):
* loader/cache/CachedRawResourceClient.h:
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::createWithContentsOfFile):
(WebCore::SharedBuffer::adoptVector):
(WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
(WebCore::SharedBuffer::appendToDataBuffer):
(WebCore::SharedBuffer::clearDataBuffer):
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::create):
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::maybeAppendPlatformData):
(WebCore::SharedBuffer::wrapCFDataArray):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(ResourceHandleStreamingClient::didReceiveData):
(ResourceHandleStreamingClient::didReceiveBuffer):
* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::createCFData):
(WebCore::SharedBuffer::createFromReadingFile):
* platform/network/BlobRegistryImpl.cpp:
(WebCore::BlobRegistryImpl::~BlobRegistryImpl):
(WebCore::createBlobResourceHandle):
(WebCore::loadBlobResourceSynchronously):
(WebCore::registerBlobResourceHandleConstructor):
(WebCore::BlobRegistryImpl::createResourceHandle):
(WebCore::BlobRegistryImpl::appendStorageItems):
(WebCore::createResourceHandle): Deleted.
(WebCore::loadResourceSynchronously): Deleted.
* platform/network/BlobRegistryImpl.h:
* platform/network/BlobResourceHandle.cpp:
(WebCore::BlobResourceHandle::createAsync):
(WebCore::BlobResourceHandle::loadResourceSynchronously):
Removed the overridden didReceiveData and didFinishLoading,
which did nothing and were identical to the function they overwrote.
* platform/network/BlobResourceHandle.h:
* platform/network/PingHandle.h:
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::ResourceHandle):
(WebCore::ResourceHandle::create):
(WebCore::ResourceHandle::scheduleFailure):
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleClient.cpp:
(WebCore::ResourceHandleClient::willCacheResponseAsync):
(WebCore::ResourceHandleClient::didReceiveBuffer):
* platform/network/ResourceHandleClient.h:
(WebCore::ResourceHandleClient::didReceiveResponse):
(WebCore::ResourceHandleClient::didReceiveData):
(WebCore::ResourceHandleClient::didFinishLoading):
(WebCore::ResourceHandleClient::didFail):
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSessionDataTask resource:receivedData:length:]):
This data must be copied in order to put it in a refcounted NSData because it comes
from IPC from the Network Process and is an IPC::DataReference which will be deallocated
when the message handling is done.
* platform/soup/SharedBufferSoup.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* testing/MockContentFilter.cpp:
(WebCore::MockContentFilter::replacementData):
(WebCore::MockContentFilter::unblockHandler):
Source/WebKit2:
* NetworkProcess/Downloads/PendingDownload.h:
* NetworkProcess/NetworkDataTask.h:
(WebKit::NetworkDataTask::client):
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):
(WebKit::NetworkLoad::didReceiveData):
(WebKit::NetworkLoad::didReceiveBuffer):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didReceiveBuffer):
(WebKit::NetworkResourceLoader::didFinishLoading):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/PingLoad.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::didReceiveBuffer):
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTask::didReceiveResponse):
(WebKit::NetworkDataTask::didReceiveData):
* Shared/WebHitTestResultData.cpp:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoaderh">trunk/Source/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGrouph">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourceClienth">trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcfSharedBufferCFcpp">trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSharedBufferMacmm">trunk/Source/WebCore/platform/mac/SharedBufferMac.mm</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="#trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp">trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobResourceHandleh">trunk/Source/WebCore/platform/network/BlobResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkPingHandleh">trunk/Source/WebCore/platform/network/PingHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandlecpp">trunk/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClientcpp">trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClienth">trunk/Source/WebCore/platform/network/ResourceHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsoupSharedBufferSoupcpp">trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockContentFiltercpp">trunk/Source/WebCore/testing/MockContentFilter.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadClienth">trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessPingLoadh">trunk/Source/WebKit2/NetworkProcess/PingLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebHitTestResultDatacpp">trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/ChangeLog 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -1,3 +1,107 @@
</span><ins>+2016-06-06 Alex Christensen <achristensen@webkit.org>
+
+ Modernize loading code
+ https://bugs.webkit.org/show_bug.cgi?id=158332
+
+ Reviewed by Darin Adler.
+
+ No new tests, no change in behavior.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResourceContent):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::continueAfterContentPolicy):
+ * loader/FrameLoader.h:
+ * loader/NetscapePlugInStreamLoader.cpp:
+ (WebCore::NetscapePlugInStreamLoader::didReceiveData):
+ (WebCore::NetscapePlugInStreamLoader::didReceiveBuffer):
+ (WebCore::NetscapePlugInStreamLoader::didReceiveDataOrBuffer):
+ (WebCore::NetscapePlugInStreamLoader::didFinishLoading):
+ * loader/NetscapePlugInStreamLoader.h:
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::deliverResponseAndData):
+ (WebCore::ResourceLoader::loadDataURL):
+ (WebCore::ResourceLoader::addDataOrBuffer):
+ (WebCore::ResourceLoader::clearResourceData):
+ (WebCore::ResourceLoader::didReceiveData):
+ (WebCore::ResourceLoader::didReceiveBuffer):
+ (WebCore::ResourceLoader::didReceiveDataOrBuffer):
+ (WebCore::ResourceLoader::didFinishLoading):
+ * loader/ResourceLoader.h:
+ (WebCore::ResourceLoader::wasCancelled):
+ (WebCore::ResourceLoader::options):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didReceiveData):
+ (WebCore::SubresourceLoader::didReceiveBuffer):
+ (WebCore::SubresourceLoader::didReceiveDataOrBuffer):
+ * loader/SubresourceLoader.h:
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::abort):
+ (WebCore::ApplicationCacheGroup::createResourceHandle):
+ * loader/appcache/ApplicationCacheGroup.h:
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::addData):
+ * loader/cache/CachedRawResourceClient.h:
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ (WebCore::SharedBuffer::createWithContentsOfFile):
+ (WebCore::SharedBuffer::adoptVector):
+ (WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
+ (WebCore::SharedBuffer::appendToDataBuffer):
+ (WebCore::SharedBuffer::clearDataBuffer):
+ * platform/SharedBuffer.h:
+ (WebCore::SharedBuffer::create):
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ (WebCore::SharedBuffer::maybeAppendPlatformData):
+ (WebCore::SharedBuffer::wrapCFDataArray):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (ResourceHandleStreamingClient::didReceiveData):
+ (ResourceHandleStreamingClient::didReceiveBuffer):
+ * platform/mac/SharedBufferMac.mm:
+ (WebCore::SharedBuffer::createCFData):
+ (WebCore::SharedBuffer::createFromReadingFile):
+ * platform/network/BlobRegistryImpl.cpp:
+ (WebCore::BlobRegistryImpl::~BlobRegistryImpl):
+ (WebCore::createBlobResourceHandle):
+ (WebCore::loadBlobResourceSynchronously):
+ (WebCore::registerBlobResourceHandleConstructor):
+ (WebCore::BlobRegistryImpl::createResourceHandle):
+ (WebCore::BlobRegistryImpl::appendStorageItems):
+ (WebCore::createResourceHandle): Deleted.
+ (WebCore::loadResourceSynchronously): Deleted.
+ * platform/network/BlobRegistryImpl.h:
+ * platform/network/BlobResourceHandle.cpp:
+ (WebCore::BlobResourceHandle::createAsync):
+ (WebCore::BlobResourceHandle::loadResourceSynchronously):
+ Removed the overridden didReceiveData and didFinishLoading,
+ which did nothing and were identical to the function they overwrote.
+ * platform/network/BlobResourceHandle.h:
+ * platform/network/PingHandle.h:
+ * platform/network/ResourceHandle.cpp:
+ (WebCore::ResourceHandle::ResourceHandle):
+ (WebCore::ResourceHandle::create):
+ (WebCore::ResourceHandle::scheduleFailure):
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleClient.cpp:
+ (WebCore::ResourceHandleClient::willCacheResponseAsync):
+ (WebCore::ResourceHandleClient::didReceiveBuffer):
+ * platform/network/ResourceHandleClient.h:
+ (WebCore::ResourceHandleClient::didReceiveResponse):
+ (WebCore::ResourceHandleClient::didReceiveData):
+ (WebCore::ResourceHandleClient::didFinishLoading):
+ (WebCore::ResourceHandleClient::didFail):
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSessionDataTask resource:receivedData:length:]):
+ This data must be copied in order to put it in a refcounted NSData because it comes
+ from IPC from the Network Process and is an IPC::DataReference which will be deallocated
+ when the message handling is done.
+ * platform/soup/SharedBufferSoup.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ * testing/MockContentFilter.cpp:
+ (WebCore::MockContentFilter::replacementData):
+ (WebCore::MockContentFilter::unblockHandler):
+
</ins><span class="cx"> 2016-06-06 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add experimental support for spring based CSS animations
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorPageAgent::cachedResourceContent(CachedResource* cachedResource, String* result, bool* base64Encoded)
</span><span class="cx"> {
</span><ins>+ // FIXME: result should be a String& and base64Encoded should be a bool&.
</ins><span class="cx"> bool hasZeroSize;
</span><span class="cx"> bool prepared = prepareCachedResourceBuffer(cachedResource, &hasZeroSize);
</span><span class="cx"> if (!prepared)
</span><span class="lines">@@ -146,11 +147,15 @@
</span><span class="cx">
</span><span class="cx"> *base64Encoded = !hasTextContent(cachedResource);
</span><span class="cx"> if (*base64Encoded) {
</span><del>- RefPtr<SharedBuffer> buffer = hasZeroSize ? SharedBuffer::create() : cachedResource->resourceBuffer();
- if (!buffer)
- return false;
- *result = base64Encode(buffer->data(), buffer->size());
- return true;
</del><ins>+ if (hasZeroSize) {
+ *result = { };
+ return true;
+ }
+ if (auto* buffer = cachedResource->resourceBuffer()) {
+ *result = base64Encode(buffer->data(), buffer->size());
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hasZeroSize) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -805,8 +805,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isStopping() && m_substituteData.isValid() && isLoadingMainResource()) {
</span><del>- if (m_substituteData.content()->size())
- dataReceived(0, m_substituteData.content()->data(), m_substituteData.content()->size());
</del><ins>+ auto content = m_substituteData.content();
+ if (content && content->size())
+ dataReceived(nullptr, content->data(), content->size());
</ins><span class="cx"> if (isLoadingMainResource())
</span><span class="cx"> finishedLoading(0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "ResourceLoadNotifier.h"
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx"> #include "SecurityContext.h"
</span><del>-#include "SharedBuffer.h"
</del><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -76,6 +75,7 @@
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SerializedScriptValue;
</span><ins>+class SharedBuffer;
</ins><span class="cx"> class StringWithDirection;
</span><span class="cx"> class SubframeLoader;
</span><span class="cx"> class SubstituteData;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -129,21 +129,21 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePlugInStreamLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
</span><span class="cx"> {
</span><del>- didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(data, length, nullptr, encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetscapePlugInStreamLoader::didReceiveBuffer(PassRefPtr<SharedBuffer> buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void NetscapePlugInStreamLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><del>- didReceiveDataOrBuffer(0, 0, buffer, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(nullptr, 0, WTFMove(buffer), encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetscapePlugInStreamLoader::didReceiveDataOrBuffer(const char* data, int length, PassRefPtr<SharedBuffer> buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void NetscapePlugInStreamLoader::didReceiveDataOrBuffer(const char* data, int length, RefPtr<SharedBuffer>&& buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> Ref<NetscapePlugInStreamLoader> protectedThis(*this);
</span><span class="cx">
</span><span class="cx"> m_client->didReceiveData(this, buffer ? buffer->data() : data, buffer ? buffer->size() : length);
</span><span class="cx">
</span><del>- ResourceLoader::didReceiveDataOrBuffer(data, length, buffer, encodedDataLength, dataPayloadType);
</del><ins>+ ResourceLoader::didReceiveDataOrBuffer(data, length, WTFMove(buffer), encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetscapePlugInStreamLoader::didFinishLoading(double finishTime)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef NetscapePlugInStreamLoader_h
-#define NetscapePlugInStreamLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -62,7 +61,7 @@
</span><span class="cx"> void willSendRequest(ResourceRequest&&, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&&)>&& callback) override;
</span><span class="cx"> void didReceiveResponse(const ResourceResponse&) override;
</span><span class="cx"> void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) override;
</span><del>- void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) override;
</del><ins>+ void didReceiveBuffer(Ref<SharedBuffer>&&, long long encodedDataLength, DataPayloadType) override;
</ins><span class="cx"> void didFinishLoading(double finishTime) override;
</span><span class="cx"> void didFail(const ResourceError&) override;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx"> void willCancel(const ResourceError&) override;
</span><span class="cx"> void didCancel(const ResourceError&) override;
</span><span class="cx">
</span><del>- void didReceiveDataOrBuffer(const char*, int, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</del><ins>+ void didReceiveDataOrBuffer(const char*, int, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
</ins><span class="cx">
</span><span class="cx"> void notifyDone();
</span><span class="cx">
</span><span class="lines">@@ -82,5 +81,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // NetscapePlugInStreamLoader_h
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> if (buffer) {
</span><span class="cx"> unsigned size = buffer->size();
</span><del>- didReceiveBuffer(buffer.release(), size, DataPayloadWholeResource);
</del><ins>+ didReceiveBuffer(buffer.releaseNonNull(), size, DataPayloadWholeResource);
</ins><span class="cx"> if (reachedTerminalState())
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -254,13 +254,13 @@
</span><span class="cx"> if (protectedThis->wasCancelled())
</span><span class="cx"> return;
</span><span class="cx"> auto& result = decodeResult.value();
</span><del>- auto dataSize = result.data->size();
</del><ins>+ auto dataSize = result.data ? result.data->size() : 0;
</ins><span class="cx">
</span><span class="cx"> ResourceResponse dataResponse { url, result.mimeType, dataSize, result.charset };
</span><span class="cx"> protectedThis->didReceiveResponse(dataResponse);
</span><span class="cx">
</span><span class="cx"> if (!protectedThis->reachedTerminalState() && dataSize)
</span><del>- protectedThis->didReceiveBuffer(result.data.get(), dataSize, DataPayloadWholeResource);
</del><ins>+ protectedThis->didReceiveBuffer(result.data.releaseNonNull(), dataSize, DataPayloadWholeResource);
</ins><span class="cx">
</span><span class="cx"> if (!protectedThis->reachedTerminalState())
</span><span class="cx"> protectedThis->didFinishLoading(currentTime());
</span><span class="lines">@@ -289,19 +289,18 @@
</span><span class="cx"> if (m_options.dataBufferingPolicy() == DoNotBufferData)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (dataPayloadType == DataPayloadWholeResource) {
- m_resourceData = buffer ? buffer : SharedBuffer::create(data, length);
- return;
- }
-
- if (!m_resourceData)
- m_resourceData = buffer ? buffer : SharedBuffer::create(data, length);
- else {
</del><ins>+ if (!m_resourceData || dataPayloadType == DataPayloadWholeResource) {
</ins><span class="cx"> if (buffer)
</span><del>- m_resourceData->append(buffer);
</del><ins>+ m_resourceData = buffer;
</ins><span class="cx"> else
</span><del>- m_resourceData->append(data, length);
</del><ins>+ m_resourceData = SharedBuffer::create(data, length);
+ return;
</ins><span class="cx"> }
</span><ins>+
+ if (buffer)
+ m_resourceData->append(*buffer);
+ else
+ m_resourceData->append(data, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::clearResourceData()
</span><span class="lines">@@ -453,23 +452,22 @@
</span><span class="cx"> // ASSERT(con == connection);
</span><span class="cx"> // ASSERT(!m_reachedTerminalState);
</span><span class="cx">
</span><del>- didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(data, length, nullptr, encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveBuffer(PassRefPtr<SharedBuffer> buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void ResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><del>- didReceiveDataOrBuffer(0, 0, buffer, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(nullptr, 0, WTFMove(buffer), encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveDataOrBuffer(const char* data, unsigned length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void ResourceLoader::didReceiveDataOrBuffer(const char* data, unsigned length, RefPtr<SharedBuffer>&& buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> // This method should only get data+length *OR* a SharedBuffer.
</span><del>- ASSERT(!prpBuffer || (!data && !length));
</del><ins>+ ASSERT(!buffer || (!data && !length));
</ins><span class="cx">
</span><span class="cx"> // Protect this in this delegate method since the additional processing can do
</span><span class="cx"> // anything including possibly derefing this; one example of this is Radar 3266216.
</span><span class="cx"> Ref<ResourceLoader> protectedThis(*this);
</span><del>- RefPtr<SharedBuffer> buffer = prpBuffer;
</del><span class="cx">
</span><span class="cx"> addDataOrBuffer(data, length, buffer.get(), dataPayloadType);
</span><span class="cx">
</span><span class="lines">@@ -632,9 +630,9 @@
</span><span class="cx"> didReceiveData(data, length, encodedDataLength, DataPayloadBytes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int encodedDataLength)
</del><ins>+void ResourceLoader::didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&& buffer, int encodedDataLength)
</ins><span class="cx"> {
</span><del>- didReceiveBuffer(buffer, encodedDataLength, DataPayloadBytes);
</del><ins>+ didReceiveBuffer(WTFMove(buffer), encodedDataLength, DataPayloadBytes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
</span><span class="cx"> virtual void didReceiveResponse(const ResourceResponse&);
</span><span class="cx"> virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType);
</span><del>- virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</del><ins>+ virtual void didReceiveBuffer(Ref<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
</ins><span class="cx"> virtual void didFinishLoading(double finishTime);
</span><span class="cx"> virtual void didFail(const ResourceError&);
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> bool wasCancelled() const { return m_cancellationStatus >= Cancelled; }
</span><span class="cx">
</span><del>- void didReceiveDataOrBuffer(const char*, unsigned, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</del><ins>+ void didReceiveDataOrBuffer(const char*, unsigned, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
</ins><span class="cx">
</span><span class="cx"> const ResourceLoaderOptions& options() { return m_options; }
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="cx"> void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override;
</span><span class="cx"> void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength) override;
</span><del>- void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength) override;
</del><ins>+ void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int encodedDataLength) override;
</ins><span class="cx"> void didFinishLoading(ResourceHandle*, double finishTime) override;
</span><span class="cx"> void didFail(ResourceHandle*, const ResourceError&) override;
</span><span class="cx"> void wasBlocked(ResourceHandle*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -306,15 +306,15 @@
</span><span class="cx">
</span><span class="cx"> void SubresourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
</span><span class="cx"> {
</span><del>- didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(data, length, nullptr, encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SubresourceLoader::didReceiveBuffer(PassRefPtr<SharedBuffer> buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void SubresourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><del>- didReceiveDataOrBuffer(0, 0, buffer, encodedDataLength, dataPayloadType);
</del><ins>+ didReceiveDataOrBuffer(nullptr, 0, WTFMove(buffer), encodedDataLength, dataPayloadType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SubresourceLoader::didReceiveDataOrBuffer(const char* data, int length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void SubresourceLoader::didReceiveDataOrBuffer(const char* data, int length, RefPtr<SharedBuffer>&& prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> if (m_resource->response().httpStatusCode() >= 400 && !m_resource->shouldIgnoreHTTPStatusCodeErrors())
</span><span class="cx"> return;
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> Ref<SubresourceLoader> protectedThis(*this);
</span><span class="cx"> RefPtr<SharedBuffer> buffer = prpBuffer;
</span><span class="cx">
</span><del>- ResourceLoader::didReceiveDataOrBuffer(data, length, buffer, encodedDataLength, dataPayloadType);
</del><ins>+ ResourceLoader::didReceiveDataOrBuffer(data, length, WTFMove(buffer), encodedDataLength, dataPayloadType);
</ins><span class="cx">
</span><span class="cx"> if (!m_loadingMultipartContent) {
</span><span class="cx"> if (auto* resourceData = this->resourceData())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SubresourceLoader_h
-#define SubresourceLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="lines">@@ -68,7 +67,7 @@
</span><span class="cx"> void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="cx"> void didReceiveResponse(const ResourceResponse&) override;
</span><span class="cx"> void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) override;
</span><del>- void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) override;
</del><ins>+ void didReceiveBuffer(Ref<SharedBuffer>&&, long long encodedDataLength, DataPayloadType) override;
</ins><span class="cx"> void didFinishLoading(double finishTime) override;
</span><span class="cx"> void didFail(const ResourceError&) override;
</span><span class="cx"> void willCancel(const ResourceError&) override;
</span><span class="lines">@@ -94,7 +93,7 @@
</span><span class="cx"> bool checkForHTTPStatusCodeError();
</span><span class="cx"> bool checkCrossOriginAccessControl(const ResourceRequest&, const ResourceResponse&, ResourceRequest& newRequest);
</span><span class="cx">
</span><del>- void didReceiveDataOrBuffer(const char*, int, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</del><ins>+ void didReceiveDataOrBuffer(const char*, int, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
</ins><span class="cx">
</span><span class="cx"> void notifyDone();
</span><span class="cx">
</span><span class="lines">@@ -130,5 +129,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // SubresourceLoader_h
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ResourceHandle> ApplicationCacheGroup::createResourceHandle(const URL& url, ApplicationCacheResource* newestCachedResource)
</del><ins>+RefPtr<ResourceHandle> ApplicationCacheGroup::createResourceHandle(const URL& url, ApplicationCacheResource* newestCachedResource)
</ins><span class="cx"> {
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> m_frame->loader().applyUserAgent(request);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> void scheduleReachedMaxAppCacheSizeCallback();
</span><span class="cx">
</span><del>- PassRefPtr<ResourceHandle> createResourceHandle(const URL&, ApplicationCacheResource* newestCachedResource);
</del><ins>+ RefPtr<ResourceHandle> createResourceHandle(const URL&, ApplicationCacheResource* newestCachedResource);
</ins><span class="cx">
</span><span class="cx"> // For normal resource loading, WebKit client is asked about each resource individually. Since application cache does not belong to any particular document,
</span><span class="cx"> // the existing client callback cannot be used, so assume that any client that enables application cache also wants it to use credential storage.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> void CachedImage::addData(const char* data, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(dataBufferingPolicy() == DoNotBufferData);
</span><del>- addIncrementalDataBuffer(*SharedBuffer::create(data, length));
</del><ins>+ addIncrementalDataBuffer(SharedBuffer::create(data, length));
</ins><span class="cx"> CachedResource::addData(data, length);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourceClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CachedRawResourceClient_h
-#define CachedRawResourceClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedResourceClient.h"
</span><span class="cx">
</span><span class="lines">@@ -48,5 +47,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // CachedRawResourceClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -62,30 +62,30 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer()
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(unsigned size)
</span><span class="cx"> : m_size(size)
</span><del>- , m_buffer(adoptRef(new DataBuffer))
</del><ins>+ , m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(const char* data, unsigned size)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> {
</span><span class="cx"> append(data, size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(const unsigned char* data, unsigned size)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> {
</span><span class="cx"> append(reinterpret_cast<const char*>(data), size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(MappedFileData&& fileData)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> , m_fileData(WTFMove(fileData))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx"> return adoptRef(new SharedBuffer(WTFMove(mappedFileData)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> SharedBuffer::adoptVector(Vector<char>& vector)
</del><ins>+Ref<SharedBuffer> SharedBuffer::adoptVector(Vector<char>& vector)
</ins><span class="cx"> {
</span><del>- RefPtr<SharedBuffer> buffer = create();
</del><ins>+ auto buffer = create();
</ins><span class="cx"> buffer->m_buffer->data.swap(vector);
</span><span class="cx"> buffer->m_size = buffer->m_buffer->data.size();
</span><del>- return buffer.release();
</del><ins>+ return buffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned SharedBuffer::size() const
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> return arrayBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SharedBuffer::append(SharedBuffer* data)
</del><ins>+void SharedBuffer::append(SharedBuffer& data)
</ins><span class="cx"> {
</span><span class="cx"> if (maybeAppendPlatformData(data))
</span><span class="cx"> return;
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> const char* segment;
</span><span class="cx"> size_t position = 0;
</span><del>- while (size_t length = data->getSomeData(segment, position)) {
</del><ins>+ while (size_t length = data.getSomeData(segment, position)) {
</ins><span class="cx"> append(segment, length);
</span><span class="cx"> position += length;
</span><span class="cx"> }
</span><span class="lines">@@ -288,10 +288,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> size_t newCapacity = std::max(static_cast<size_t>(m_size), currentCapacity * 2);
</span><del>- RefPtr<DataBuffer> newBuffer = adoptRef(new DataBuffer);
</del><ins>+ auto newBuffer = adoptRef(*new DataBuffer);
</ins><span class="cx"> newBuffer->data.reserveInitialCapacity(newCapacity);
</span><span class="cx"> newBuffer->data = m_buffer->data;
</span><del>- m_buffer = newBuffer.release();
</del><ins>+ m_buffer = WTFMove(newBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::appendToDataBuffer(const char *data, unsigned length) const
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> void SharedBuffer::clearDataBuffer()
</span><span class="cx"> {
</span><span class="cx"> if (!m_buffer->hasOneRef())
</span><del>- m_buffer = adoptRef(new DataBuffer);
</del><ins>+ m_buffer = adoptRef(*new DataBuffer);
</ins><span class="cx"> else
</span><span class="cx"> m_buffer->data.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline unsigned SharedBuffer::platformDataSize() const
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool SharedBuffer::maybeAppendPlatformData(SharedBuffer*)
</del><ins>+inline bool SharedBuffer::maybeAppendPlatformData(SharedBuffer&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SharedBuffer_h
-#define SharedBuffer_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="lines">@@ -52,14 +51,14 @@
</span><span class="cx">
</span><span class="cx"> class SharedBuffer : public RefCounted<SharedBuffer> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<SharedBuffer> create() { return adoptRef(new SharedBuffer); }
- static PassRefPtr<SharedBuffer> create(unsigned size) { return adoptRef(new SharedBuffer(size)); }
- static PassRefPtr<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); }
</del><ins>+ static Ref<SharedBuffer> create() { return adoptRef(*new SharedBuffer); }
+ static Ref<SharedBuffer> create(unsigned size) { return adoptRef(*new SharedBuffer(size)); }
+ static Ref<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(*new SharedBuffer(c, i)); }
</ins><span class="cx"> static Ref<SharedBuffer> create(const unsigned char* data, unsigned size) { return adoptRef(*new SharedBuffer(data, size)); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<SharedBuffer> createWithContentsOfFile(const String& filePath);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static PassRefPtr<SharedBuffer> adoptVector(Vector<char>& vector);
</del><ins>+ WEBCORE_EXPORT static Ref<SharedBuffer> adoptVector(Vector<char>&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~SharedBuffer();
</span><span class="cx">
</span><span class="lines">@@ -90,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const { return !size(); }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void append(SharedBuffer*);
</del><ins>+ WEBCORE_EXPORT void append(SharedBuffer&);
</ins><span class="cx"> WEBCORE_EXPORT void append(const char*, unsigned);
</span><span class="cx"> WEBCORE_EXPORT void append(const Vector<char>&);
</span><span class="cx">
</span><span class="lines">@@ -99,7 +98,7 @@
</span><span class="cx"> unsigned platformDataSize() const;
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><del>- static PassRefPtr<SharedBuffer> wrapCFDataArray(CFArrayRef);
</del><ins>+ static Ref<SharedBuffer> wrapCFDataArray(CFArrayRef);
</ins><span class="cx"> void append(CFDataRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -144,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void clearPlatformData();
</span><span class="cx"> void maybeTransferPlatformData();
</span><del>- bool maybeAppendPlatformData(SharedBuffer*);
</del><ins>+ bool maybeAppendPlatformData(SharedBuffer&);
</ins><span class="cx">
</span><span class="cx"> void maybeTransferMappedFileData();
</span><span class="cx">
</span><span class="lines">@@ -155,14 +154,14 @@
</span><span class="cx"> void clearDataBuffer();
</span><span class="cx">
</span><span class="cx"> unsigned m_size { 0 };
</span><del>- mutable RefPtr<DataBuffer> m_buffer;
</del><ins>+ mutable Ref<DataBuffer> m_buffer;
</ins><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx"> explicit SharedBuffer(CFArrayRef);
</span><span class="cx"> mutable Vector<RetainPtr<CFDataRef>> m_dataArray;
</span><span class="cx"> unsigned copySomeDataFromDataArray(const char*& someData, unsigned position) const;
</span><span class="cx"> const char *singleDataArrayBuffer() const;
</span><del>- bool maybeAppendDataArray(SharedBuffer*);
</del><ins>+ bool maybeAppendDataArray(SharedBuffer&);
</ins><span class="cx"> #else
</span><span class="cx"> mutable Vector<char*> m_segments;
</span><span class="cx"> #endif
</span><span class="lines">@@ -184,5 +183,3 @@
</span><span class="cx"> RefPtr<SharedBuffer> utf8Buffer(const String&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // SharedBuffer_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(CFDataRef cfData)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> , m_cfData(cfData)
</span><span class="cx"> , m_vnodeToken(VNodeTracker::singleton().token())
</span><span class="cx"> {
</span><span class="lines">@@ -110,22 +110,22 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedBuffer::maybeAppendPlatformData(SharedBuffer* newContents)
</del><ins>+bool SharedBuffer::maybeAppendPlatformData(SharedBuffer& newContents)
</ins><span class="cx"> {
</span><del>- if (size() || !newContents->m_cfData)
</del><ins>+ if (size() || !newContents.m_cfData)
</ins><span class="cx"> return false;
</span><del>- m_cfData = newContents->m_cfData;
</del><ins>+ m_cfData = newContents.m_cfData;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><del>-PassRefPtr<SharedBuffer> SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
</del><ins>+Ref<SharedBuffer> SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
</ins><span class="cx"> {
</span><del>- return adoptRef(new SharedBuffer(cfDataArray));
</del><ins>+ return adoptRef(*new SharedBuffer(cfDataArray));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(CFArrayRef cfDataArray)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(adoptRef(*new DataBuffer))
</ins><span class="cx"> , m_cfData(nullptr)
</span><span class="cx"> {
</span><span class="cx"> CFIndex dataArrayCount = CFArrayGetCount(cfDataArray);
</span><span class="lines">@@ -185,16 +185,16 @@
</span><span class="cx"> return reinterpret_cast<const char*>(CFDataGetBytePtr(m_dataArray.at(0).get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedBuffer::maybeAppendDataArray(SharedBuffer* data)
</del><ins>+bool SharedBuffer::maybeAppendDataArray(SharedBuffer& data)
</ins><span class="cx"> {
</span><del>- if (m_buffer->data.size() || m_cfData || !data->m_dataArray.size())
</del><ins>+ if (m_buffer->data.size() || m_cfData || !data.m_dataArray.size())
</ins><span class="cx"> return false;
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> unsigned originalSize = size();
</span><span class="cx"> #endif
</span><del>- for (auto& cfData : data->m_dataArray)
</del><ins>+ for (auto& cfData : data.m_dataArray)
</ins><span class="cx"> append(cfData.get());
</span><del>- ASSERT(size() == originalSize + data->size());
</del><ins>+ ASSERT(size() == originalSize + data.size());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> ResourceRequest willSendRequest(ResourceHandle*, ResourceRequest&&, ResourceResponse&&) override;
</span><span class="cx"> void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override;
</span><span class="cx"> void didReceiveData(ResourceHandle*, const char*, unsigned, int) override;
</span><del>- void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength) override;
</del><ins>+ void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int encodedLength) override;
</ins><span class="cx"> void didFinishLoading(ResourceHandle*, double /*finishTime*/) override;
</span><span class="cx"> void didFail(ResourceHandle*, const ResourceError&) override;
</span><span class="cx"> void wasBlocked(ResourceHandle*) override;
</span><span class="lines">@@ -1100,7 +1100,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandleStreamingClient::didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int /* encodedLength */)
</del><ins>+void ResourceHandleStreamingClient::didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&& buffer, int /* encodedLength */)
</ins><span class="cx"> {
</span><span class="cx"> // This pattern is suggested by SharedBuffer.h.
</span><span class="cx"> const char* segment;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSharedBufferMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return cfData;
</span><span class="cx">
</span><span class="cx"> data(); // Force data into m_buffer from segments or data array.
</span><del>- return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:m_buffer.get()]).leakRef());
</del><ins>+ return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:m_buffer.ptr()]).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> SharedBuffer::createFromReadingFile(const String& filePath)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<ResourceHandle> createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
</del><ins>+static Ref<ResourceHandle> createBlobResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
</ins><span class="cx"> {
</span><span class="cx"> return static_cast<BlobRegistryImpl&>(blobRegistry()).createResourceHandle(request, client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void loadResourceSynchronously(NetworkingContext*, const ResourceRequest& request, StoredCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</del><ins>+static void loadBlobResourceSynchronously(NetworkingContext*, const ResourceRequest& request, StoredCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</ins><span class="cx"> {
</span><span class="cx"> BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(request.url());
</span><span class="cx"> BlobResourceHandle::loadResourceSynchronously(blobData, request, error, response, data);
</span><span class="lines">@@ -68,20 +68,17 @@
</span><span class="cx"> {
</span><span class="cx"> static bool didRegister = false;
</span><span class="cx"> if (!didRegister) {
</span><del>- ResourceHandle::registerBuiltinConstructor("blob", createResourceHandle);
- ResourceHandle::registerBuiltinSynchronousLoader("blob", loadResourceSynchronously);
</del><ins>+ ResourceHandle::registerBuiltinConstructor("blob", createBlobResourceHandle);
+ ResourceHandle::registerBuiltinSynchronousLoader("blob", loadBlobResourceSynchronously);
</ins><span class="cx"> didRegister = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<ResourceHandle> BlobRegistryImpl::createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
</del><ins>+Ref<ResourceHandle> BlobRegistryImpl::createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
</ins><span class="cx"> {
</span><span class="cx"> auto handle = BlobResourceHandle::createAsync(getBlobDataFromURL(request.url()), request, client);
</span><del>- if (!handle)
- return nullptr;
-
</del><span class="cx"> handle->start();
</span><del>- return handle;
</del><ins>+ return WTFMove(handle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryImpl::appendStorageItems(BlobData* blobData, const BlobDataItemList& items, long long offset, long long length)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-07 18:52:06 UTC (rev 201761)
</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 BlobRegistryImpl_h
-#define BlobRegistryImpl_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "BlobData.h"
</span><span class="cx"> #include "BlobRegistry.h"
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> BlobData* getBlobDataFromURL(const URL&) const;
</span><span class="cx">
</span><del>- RefPtr<ResourceHandle> createResourceHandle(const ResourceRequest&, ResourceHandleClient*);
</del><ins>+ Ref<ResourceHandle> createResourceHandle(const ResourceRequest&, ResourceHandleClient*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void appendStorageItems(BlobData*, const BlobDataItemList&, long long offset, long long length);
</span><span class="lines">@@ -74,5 +73,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // BlobRegistryImpl_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -84,8 +84,6 @@
</span><span class="cx"> BlobResourceSynchronousLoader(ResourceError&, ResourceResponse&, Vector<char>&);
</span><span class="cx">
</span><span class="cx"> void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override;
</span><del>- void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) override;
- void didFinishLoading(ResourceHandle*, double /*finishTime*/) override;
</del><span class="cx"> void didFail(ResourceHandle*, const ResourceError&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -116,14 +114,6 @@
</span><span class="cx"> static_cast<BlobResourceHandle*>(handle)->readSync(m_data.data(), static_cast<int>(m_data.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, unsigned, int)
-{
-}
-
-void BlobResourceSynchronousLoader::didFinishLoading(ResourceHandle*, double)
-{
-}
-
</del><span class="cx"> void BlobResourceSynchronousLoader::didFail(ResourceHandle*, const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> m_error = error;
</span><span class="lines">@@ -134,9 +124,9 @@
</span><span class="cx"> ///////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> // BlobResourceHandle
</span><span class="cx">
</span><del>-PassRefPtr<BlobResourceHandle> BlobResourceHandle::createAsync(BlobData* blobData, const ResourceRequest& request, ResourceHandleClient* client)
</del><ins>+Ref<BlobResourceHandle> BlobResourceHandle::createAsync(BlobData* blobData, const ResourceRequest& request, ResourceHandleClient* client)
</ins><span class="cx"> {
</span><del>- return adoptRef(new BlobResourceHandle(blobData, request, client, true));
</del><ins>+ return adoptRef(*new BlobResourceHandle(blobData, request, client, true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobResourceHandle::loadResourceSynchronously(BlobData* blobData, const ResourceRequest& request, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -28,12 +28,10 @@
</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 BlobResourceHandle_h
-#define BlobResourceHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "FileStreamClient.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -48,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> class BlobResourceHandle final : public FileStreamClient, public ResourceHandle {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<BlobResourceHandle> createAsync(BlobData*, const ResourceRequest&, ResourceHandleClient*);
</del><ins>+ static Ref<BlobResourceHandle> createAsync(BlobData*, const ResourceRequest&, ResourceHandleClient*);
</ins><span class="cx">
</span><span class="cx"> static void loadResourceSynchronously(BlobData*, const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data);
</span><span class="cx">
</span><span class="lines">@@ -112,5 +110,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // BlobResourceHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkPingHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/PingHandle.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/PingHandle.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/PingHandle.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -23,8 +23,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 PingHandle_h
-#define PingHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceHandleClient.h"
</span><span class="lines">@@ -58,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override { delete this; }
</span><del>- void didReceiveData(ResourceHandle*, const char*, unsigned, int) override { delete this; }
</del><ins>+ void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int) override { delete this; };
</ins><span class="cx"> void didFinishLoading(ResourceHandle*, double) override { delete this; }
</span><span class="cx"> void didFail(ResourceHandle*, const ResourceError&) override { delete this; }
</span><span class="cx"> bool shouldUseCredentialStorage(ResourceHandle*) override { return m_shouldUseCredentialStorage; }
</span><span class="lines">@@ -81,5 +80,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // PingHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ResourceHandle> ResourceHandle::create(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
</del><ins>+RefPtr<ResourceHandle> ResourceHandle::create(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
</ins><span class="cx"> {
</span><span class="cx"> BuiltinResourceHandleConstructorMap::iterator protocolMapItem = builtinResourceHandleConstructorMap().find(request.url().protocol());
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (newHandle->start())
</span><span class="cx"> return newHandle.release();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::scheduleFailure(FailureType type)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -23,8 +23,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 ResourceHandle_h
-#define ResourceHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "AuthenticationClient.h"
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><span class="lines">@@ -99,7 +98,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static PassRefPtr<ResourceHandle> create(NetworkingContext*, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
</del><ins>+ WEBCORE_EXPORT static RefPtr<ResourceHandle> create(NetworkingContext*, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
</ins><span class="cx"> WEBCORE_EXPORT static void loadResourceSynchronously(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual ~ResourceHandle();
</span><span class="lines">@@ -240,7 +239,7 @@
</span><span class="cx"> static CFMutableDictionaryRef createSSLPropertiesFromNSURLRequest(const ResourceRequest&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- typedef RefPtr<ResourceHandle> (*BuiltinConstructor)(const ResourceRequest& request, ResourceHandleClient* client);
</del><ins>+ typedef Ref<ResourceHandle> (*BuiltinConstructor)(const ResourceRequest& request, ResourceHandleClient* client);
</ins><span class="cx"> static void registerBuiltinConstructor(const AtomicString& protocol, BuiltinConstructor);
</span><span class="cx">
</span><span class="cx"> typedef void (*BuiltinSynchronousLoader)(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
</span><span class="lines">@@ -297,5 +296,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ResourceHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void ResourceHandleClient::didReceiveBuffer(ResourceHandle* handle, PassRefPtr<SharedBuffer> buffer, int encodedDataLength)
</del><ins>+void ResourceHandleClient::didReceiveBuffer(ResourceHandle* handle, Ref<SharedBuffer>&& buffer, int encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> didReceiveData(handle, buffer->data(), buffer->size(), encodedDataLength);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -24,11 +24,10 @@
</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 ResourceHandleClient_h
-#define ResourceHandleClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "PlatformExportMacros.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include <CFNetwork/CFURLCachePriv.h>
</span><span class="lines">@@ -75,7 +74,7 @@
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { }
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { }
</span><del>- WEBCORE_EXPORT virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength);
</del><ins>+ WEBCORE_EXPORT virtual void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int encodedDataLength);
</ins><span class="cx">
</span><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) { }
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) { }
</span><span class="lines">@@ -140,5 +139,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -569,9 +569,6 @@
</span><span class="cx"> ASSERT_UNUSED(resource, &resource == _resource);
</span><span class="cx"> UNUSED_PARAM(data);
</span><span class="cx"> UNUSED_PARAM(length);
</span><del>- // FIXME: try to avoid a copy, if possible.
- // e.g., RetainPtr<CFDataRef> cfData = resource->resourceBuffer()->createCFData();
-
</del><span class="cx"> RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data length:length]);
</span><span class="cx"> RetainPtr<WebCoreNSURLSessionDataTask> strongSelf { self };
</span><span class="cx"> [self.session addDelegateOperation:[strongSelf, length, nsData] {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int /* encodedLength */) override
</del><ins>+ void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&& buffer, int /* encodedLength */) override
</ins><span class="cx"> {
</span><span class="cx"> // This pattern is suggested by SharedBuffer.h.
</span><span class="cx"> const char* segment;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupSharedBufferSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(SoupBuffer* soupBuffer)
</span><del>- : m_buffer(adoptRef(new DataBuffer))
</del><ins>+ : m_buffer(*new DataBuffer)
</ins><span class="cx"> , m_soupBuffer(soupBuffer)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(soupBuffer);
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return m_soupBuffer->length;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedBuffer::maybeAppendPlatformData(SharedBuffer*)
</del><ins>+bool SharedBuffer::maybeAppendPlatformData(SharedBuffer&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockContentFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockContentFilter.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockContentFilter.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebCore/testing/MockContentFilter.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> Ref<SharedBuffer> MockContentFilter::replacementData() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(didBlockData());
</span><del>- return adoptRef(*SharedBuffer::create(m_replacementData.data(), m_replacementData.size()).leakRef());
</del><ins>+ return SharedBuffer::create(m_replacementData.data(), m_replacementData.size()).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContentFilterUnblockHandler MockContentFilter::unblockHandler() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-06 Alex Christensen <achristensen@webkit.org>
+
+ Modernize loading code
+ https://bugs.webkit.org/show_bug.cgi?id=158332
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/Downloads/PendingDownload.h:
+ * NetworkProcess/NetworkDataTask.h:
+ (WebKit::NetworkDataTask::client):
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+ (WebKit::NetworkLoad::didReceiveData):
+ (WebKit::NetworkLoad::didReceiveBuffer):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didReceiveBuffer):
+ (WebKit::NetworkResourceLoader::didFinishLoading):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/PingLoad.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::didReceiveBuffer):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTask::didReceiveResponse):
+ (WebKit::NetworkDataTask::didReceiveData):
+ * Shared/WebHitTestResultData.cpp:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResource):
+
</ins><span class="cx"> 2016-06-05 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add experimental support for spring based CSS animations
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> bool isSynchronous() const override { return false; }
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(const WebCore::ResourceResponse&) override { return ShouldContinueDidReceiveResponse::No; };
</span><del>- void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override { };
</del><ins>+ void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override { };
</ins><span class="cx"> void didFinishLoading(double finishTime) override { };
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><span class="cx"> void didBecomeDownload() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> virtual void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler) = 0;
</span><span class="cx"> virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) = 0;
</span><span class="cx"> virtual void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) = 0;
</span><del>- virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) = 0;
</del><ins>+ virtual void didReceiveData(Ref<WebCore::SharedBuffer>&&) = 0;
</ins><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
</span><span class="cx"> virtual void didBecomeDownload() = 0;
</span><span class="cx"> virtual void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) = 0;
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</span><span class="cx"> void didCompleteWithError(const WebCore::ResourceError&);
</span><span class="cx"> void didReceiveResponse(const WebCore::ResourceResponse&, ResponseCompletionHandler);
</span><del>- void didReceiveData(RefPtr<WebCore::SharedBuffer>&&);
</del><ins>+ void didReceiveData(Ref<WebCore::SharedBuffer>&&);
</ins><span class="cx"> void didBecomeDownload();
</span><span class="cx">
</span><span class="cx"> NetworkDataTaskClient* client() const { return m_client; }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><ins>+#include <WebCore/SharedBuffer.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -249,9 +250,9 @@
</span><span class="cx"> m_responseCompletionHandler = completionHandler;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveData(RefPtr<SharedBuffer>&& buffer)
</del><ins>+void NetworkLoad::didReceiveData(Ref<SharedBuffer>&& buffer)
</ins><span class="cx"> {
</span><del>- ASSERT(buffer);
</del><ins>+ // FIXME: This should be the encoded data length, not the decoded data length.
</ins><span class="cx"> auto size = buffer->size();
</span><span class="cx"> m_client.didReceiveBuffer(WTFMove(buffer), size);
</span><span class="cx"> }
</span><span class="lines">@@ -300,7 +301,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveBuffer(ResourceHandle* handle, PassRefPtr<SharedBuffer> buffer, int reportedEncodedDataLength)
</del><ins>+void NetworkLoad::didReceiveBuffer(ResourceHandle* handle, Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="cx"> m_client.didReceiveBuffer(WTFMove(buffer), reportedEncodedDataLength);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler) final;
</span><span class="cx"> void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) final;
</span><span class="cx"> void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) final;
</span><del>- void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) final;
</del><ins>+ void didReceiveData(Ref<WebCore::SharedBuffer>&&) final;
</ins><span class="cx"> void didCompleteWithError(const WebCore::ResourceError&) final;
</span><span class="cx"> void didBecomeDownload() final;
</span><span class="cx"> void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="cx"> void didReceiveResponseAsync(WebCore::ResourceHandle*, const WebCore::ResourceResponse&) override;
</span><span class="cx"> void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) override;
</span><del>- void didReceiveBuffer(WebCore::ResourceHandle*, PassRefPtr<WebCore::SharedBuffer>, int encodedDataLength) override;
</del><ins>+ void didReceiveBuffer(WebCore::ResourceHandle*, Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</ins><span class="cx"> void didFinishLoading(WebCore::ResourceHandle*, double finishTime) override;
</span><span class="cx"> void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) override;
</span><span class="cx"> void wasBlocked(WebCore::ResourceHandle*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><del>-#include <WebCore/SharedBuffer.h>
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -38,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class ProtectionSpace;
</span><ins>+class SharedBuffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> virtual void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) = 0;
</span><span class="cx"> enum class ShouldContinueDidReceiveResponse { No, Yes };
</span><span class="cx"> virtual ShouldContinueDidReceiveResponse didReceiveResponse(const WebCore::ResourceResponse&) = 0;
</span><del>- virtual void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) = 0;
</del><ins>+ virtual void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) = 0;
</ins><span class="cx"> virtual void didFinishLoading(double finishTime) = 0;
</span><span class="cx"> virtual void didFailLoading(const WebCore::ResourceError&) = 0;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> return ShouldContinueDidReceiveResponse::No;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkResourceLoader::didReceiveBuffer(RefPtr<SharedBuffer>&& buffer, int reportedEncodedDataLength)
</del><ins>+void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> ASSERT(!m_cacheEntryForValidation);
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> startBufferingTimerIfNeeded();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- sendBufferMaybeAborting(*buffer, encodedDataLength);
</del><ins>+ sendBufferMaybeAborting(buffer, encodedDataLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFinishLoading(double finishTime)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> bool isSynchronous() const override;
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(const WebCore::ResourceResponse&) override;
</span><del>- void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</del><ins>+ void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</ins><span class="cx"> void didFinishLoading(double finishTime) override;
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessPingLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/PingLoad.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> completionHandler(WebCore::PolicyAction::PolicyIgnore);
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><del>- void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) override { ASSERT_NOT_REACHED(); }
</del><ins>+ void didReceiveData(Ref<WebCore::SharedBuffer>&&) override { ASSERT_NOT_REACHED(); }
</ins><span class="cx"> void didCompleteWithError(const WebCore::ResourceError&) override { delete this; }
</span><span class="cx"> void didBecomeDownload() override { ASSERT_NOT_REACHED(); }
</span><span class="cx"> void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override { }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return ShouldContinueDidReceiveResponse::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeLoad::didReceiveBuffer(RefPtr<SharedBuffer>&& buffer, int reportedEncodedDataLength)
</del><ins>+void SpeculativeLoad::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_cacheEntryForValidation);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> bool isSynchronous() const override { return false; }
</span><span class="cx"> void willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse) override;
</span><span class="cx"> ShouldContinueDidReceiveResponse didReceiveResponse(const WebCore::ResourceResponse&) override;
</span><del>- void didReceiveBuffer(RefPtr<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</del><ins>+ void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</ins><span class="cx"> void didFinishLoading(double finishTime) override;
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkDataTask::didReceiveData(RefPtr<WebCore::SharedBuffer>&& data)
</del><ins>+void NetworkDataTask::didReceiveData(Ref<WebCore::SharedBuffer>&& data)
</ins><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didReceiveData(WTFMove(data));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebHitTestResultDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include <WebCore/HitTestResult.h>
</span><span class="cx"> #include <WebCore/Node.h>
</span><span class="cx"> #include <WebCore/RenderObject.h>
</span><ins>+#include <WebCore/SharedBuffer.h>
</ins><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (201760 => 201761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-07 18:20:17 UTC (rev 201760)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-07 18:52:06 UTC (rev 201761)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> // Only send data to the didReceiveData callback if it exists.
</span><span class="cx"> if (unsigned bufferSize = buffer->size())
</span><del>- m_coreLoader->didReceiveBuffer(buffer.release(), bufferSize, DataPayloadWholeResource);
</del><ins>+ m_coreLoader->didReceiveBuffer(buffer.releaseNonNull(), bufferSize, DataPayloadWholeResource);
</ins><span class="cx">
</span><span class="cx"> if (!m_coreLoader)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>