<!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>[170930] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170930">170930</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 14:19:47 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add SharedBuffer::wrapCFDataArray() and use it
https://bugs.webkit.org/show_bug.cgi?id=134733
Reviewed by Antti Koivisto.
No new tests. Should be covered by existing tests.
* platform/SharedBuffer.h:
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::wrapCFDataArray):
(WebCore::SharedBuffer::SharedBuffer):
* platform/network/ResourceHandle.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::handleDataArray): Deleted.
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray):
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegateWithOperationQueuecpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-07-09 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><ins>+ Add SharedBuffer::wrapCFDataArray() and use it
+ https://bugs.webkit.org/show_bug.cgi?id=134733
+
+ Reviewed by Antti Koivisto.
+
+ No new tests. Should be covered by existing tests.
+
+ * platform/SharedBuffer.h:
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::wrapCFDataArray):
+ (WebCore::SharedBuffer::SharedBuffer):
+ * platform/network/ResourceHandle.h:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::handleDataArray): Deleted.
+ * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+ (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
+ * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray):
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]):
+
+2014-07-09 Pratik Solanki <psolanki@apple.com>
+
</ins><span class="cx"> Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134732
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> unsigned platformDataSize() const;
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><ins>+ static PassRefPtr<SharedBuffer> wrapCFDataArray(CFArrayRef);
</ins><span class="cx"> void append(CFDataRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -196,6 +197,7 @@
</span><span class="cx"> bool m_shouldUsePurgeableMemory;
</span><span class="cx"> mutable OwnPtr<PurgeableBuffer> m_purgeableBuffer;
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><ins>+ explicit SharedBuffer(CFArrayRef);
</ins><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></span></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><span class="cx"> #include "PurgeableBuffer.h"
</span><ins>+#include <wtf/cf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> #include "DiskImageCacheIOS.h"
</span><span class="lines">@@ -112,6 +113,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><ins>+PassRefPtr<SharedBuffer> SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
+{
+ return adoptRef(new SharedBuffer(cfDataArray));
+}
+
+SharedBuffer::SharedBuffer(CFArrayRef cfDataArray)
+ : m_size(0)
+ , m_shouldUsePurgeableMemory(true)
+#if ENABLE(DISK_IMAGE_CACHE)
+ , m_isMemoryMapped(false)
+ , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
+ , m_notifyMemoryMappedCallback(nullptr)
+ , m_notifyMemoryMappedCallbackData(nullptr)
+#endif
+ , m_cfData(nullptr)
+{
+ CFIndex dataArrayCount = CFArrayGetCount(cfDataArray);
+ for (CFIndex index = 0; index < dataArrayCount; ++index)
+ append(checked_cf_cast<CFDataRef>(CFArrayGetValueAtIndex(cfDataArray, index)));
+}
+
</ins><span class="cx"> void SharedBuffer::append(CFDataRef data)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(data);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -258,10 +258,6 @@
</span><span class="cx"> static CFMutableDictionaryRef createSSLPropertiesFromNSURLRequest(const ResourceRequest&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
- void handleDataArray(CFArrayRef dataArray);
-#endif
-
</del><span class="cx"> typedef PassRefPtr<ResourceHandle> (*BuiltinConstructor)(const ResourceRequest& request, ResourceHandleClient* client);
</span><span class="cx"> static void registerBuiltinConstructor(const AtomicString& protocol, BuiltinConstructor);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -624,29 +624,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // USE(CFNETWORK)
</span><span class="cx">
</span><del>-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-void ResourceHandle::handleDataArray(CFArrayRef dataArray)
-{
- ASSERT(client());
- if (client()->supportsDataArray()) {
- client()->didReceiveDataArray(this, dataArray);
- return;
- }
-
- CFIndex count = CFArrayGetCount(dataArray);
- ASSERT(count);
- if (count == 1) {
- CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, 0));
- client()->didReceiveBuffer(this, SharedBuffer::wrapCFData(data), -1);
- return;
- }
-
- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create();
- for (CFIndex index = 0; index < count; index++)
- sharedBuffer->append(static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, index)));
-
- client()->didReceiveBuffer(this, sharedBuffer, -1);
-}
-#endif
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegateWithOperationQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> if (protector->hasHandle()) {
</span><span class="cx"> LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
</span><span class="cx">
</span><del>- m_handle->handleDataArray(dataArray);
</del><ins>+ m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(dataArray), -1);
</ins><span class="cx"> }
</span><span class="cx"> CFRelease(dataArray);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -275,7 +275,8 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_handle->handleDataArray(dataArray);
</del><ins>+ if (ResourceHandleClient* client = m_handle->client())
+ client->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(dataArray), -1);
</ins><span class="cx"> }
</span><span class="cx"> #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_handle->handleDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</del><ins>+ m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(reinterpret_cast<CFArrayRef>(dataArray)), -1);
</ins><span class="cx"> // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (170929 => 170930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-07-09 21:19:47 UTC (rev 170930)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> if (!m_handle || !m_handle->client())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_handle->handleDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</del><ins>+ m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(reinterpret_cast<CFArrayRef>(dataArray)), -1);
</ins><span class="cx"> // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>