<!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>[170154] trunk/Source/WebKit2</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/170154">170154</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-06-19 11:33:20 -0700 (Thu, 19 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Copy SharedBuffer data into IPC message directly
https://bugs.webkit.org/show_bug.cgi?id=133920
Reviewed by Anders Carlsson.
When data array callbacks are enabled, we currently merge all the CFDataRefs in SharedBuffer
into one contiguous memory buffer when creating IPC::DataReference. This patch creates a
subclass of DataReference that uses SharedBuffer::getSomeData() to copy the data directly
into the IPC message.
* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
* Platform/IPC/ArgumentEncoder.cpp:
(IPC::ArgumentEncoder::reserve): Added.
(IPC::ArgumentEncoder::grow):
* Platform/IPC/ArgumentEncoder.h:
* Platform/IPC/DataReference.cpp:
(IPC::SharedBufferDataReference::encode):
* Platform/IPC/DataReference.h:
(IPC::DataReference::~DataReference):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp">trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncoderh">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCDataReferencecpp">trunk/Source/WebKit2/Platform/IPC/DataReference.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCDataReferenceh">trunk/Source/WebKit2/Platform/IPC/DataReference.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-06-19 Pratik Solanki <psolanki@apple.com>
+
+ Copy SharedBuffer data into IPC message directly
+ https://bugs.webkit.org/show_bug.cgi?id=133920
+
+ Reviewed by Anders Carlsson.
+
+ When data array callbacks are enabled, we currently merge all the CFDataRefs in SharedBuffer
+ into one contiguous memory buffer when creating IPC::DataReference. This patch creates a
+ subclass of DataReference that uses SharedBuffer::getSomeData() to copy the data directly
+ into the IPC message.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+ * Platform/IPC/ArgumentEncoder.cpp:
+ (IPC::ArgumentEncoder::reserve): Added.
+ (IPC::ArgumentEncoder::grow):
+ * Platform/IPC/ArgumentEncoder.h:
+ * Platform/IPC/DataReference.cpp:
+ (IPC::SharedBufferDataReference::encode):
+ * Platform/IPC/DataReference.h:
+ (IPC::DataReference::~DataReference):
+
</ins><span class="cx"> 2014-06-18 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fixing the GTK+ build after r170114.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx">
</span><del>- IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
</del><ins>+ IPC::SharedBufferDataReference dataReference(buffer);
</ins><span class="cx"> loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -81,28 +81,33 @@
</span><span class="cx"> return ((value + alignment - 1) / alignment) * alignment;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint8_t* ArgumentEncoder::grow(unsigned alignment, size_t size)
</del><ins>+void ArgumentEncoder::reserve(size_t size)
</ins><span class="cx"> {
</span><del>- size_t alignedSize = roundUpToAlignment(m_bufferSize, alignment);
-
- if (alignedSize + size > m_bufferCapacity) {
- size_t newCapacity = roundUpToAlignment(m_bufferCapacity * 2, 4096);
- while (newCapacity < alignedSize + size)
- newCapacity *= 2;
</del><ins>+ if (size <= m_bufferCapacity)
+ return;
</ins><span class="cx">
</span><del>- uint8_t* newBuffer = static_cast<uint8_t*>(allocBuffer(newCapacity));
- if (!newBuffer)
- CRASH();
</del><ins>+ size_t newCapacity = roundUpToAlignment(m_bufferCapacity * 2, 4096);
+ while (newCapacity < size)
+ newCapacity *= 2;
</ins><span class="cx">
</span><del>- memcpy(newBuffer, m_buffer, m_bufferSize);
</del><ins>+ uint8_t* newBuffer = static_cast<uint8_t*>(allocBuffer(newCapacity));
+ if (!newBuffer)
+ CRASH();
</ins><span class="cx">
</span><del>- if (m_buffer != m_inlineBuffer)
- freeBuffer(m_buffer, m_bufferCapacity);
</del><ins>+ memcpy(newBuffer, m_buffer, m_bufferSize);
</ins><span class="cx">
</span><del>- m_buffer = newBuffer;
- m_bufferCapacity = newCapacity;
- }
</del><ins>+ if (m_buffer != m_inlineBuffer)
+ freeBuffer(m_buffer, m_bufferCapacity);
</ins><span class="cx">
</span><ins>+ m_buffer = newBuffer;
+ m_bufferCapacity = newCapacity;
+}
+
+uint8_t* ArgumentEncoder::grow(unsigned alignment, size_t size)
+{
+ size_t alignedSize = roundUpToAlignment(m_bufferSize, alignment);
+ reserve(alignedSize + size);
+
</ins><span class="cx"> m_bufferSize = alignedSize + size;
</span><span class="cx"> m_bufferPointer = m_buffer + alignedSize + size;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx">
</span><span class="cx"> void addAttachment(const Attachment&);
</span><span class="cx"> Vector<Attachment> releaseAttachments();
</span><ins>+ void reserve(size_t);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void encode(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCDataReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/DataReference.cpp (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/DataReference.cpp 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/Platform/IPC/DataReference.cpp 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -41,4 +41,19 @@
</span><span class="cx"> return decoder.decodeVariableLengthByteArray(dataReference);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SharedBufferDataReference::encode(ArgumentEncoder& encoder) const
+{
+ uint64_t bufferSize = static_cast<uint64_t>(m_buffer->size());
+ encoder.reserve(bufferSize + sizeof(uint64_t));
+ encoder << bufferSize;
+
+ const char* partialData;
+ unsigned position = 0;
+ while (position < bufferSize) {
+ unsigned bytesToWrite = m_buffer->getSomeData(partialData, position);
+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(partialData), bytesToWrite, 1);
+ position += bytesToWrite;
+ }
+}
+
</ins><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCDataReferenceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/DataReference.h (170153 => 170154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/DataReference.h 2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/Platform/IPC/DataReference.h 2014-06-19 18:33:20 UTC (rev 170154)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DataReference_h
</span><span class="cx"> #define DataReference_h
</span><span class="cx">
</span><ins>+#include <WebCore/SharedBuffer.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="lines">@@ -72,14 +73,34 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void encode(ArgumentEncoder&) const;
</del><ins>+ virtual void encode(ArgumentEncoder&) const;
</ins><span class="cx"> static bool decode(ArgumentDecoder&, DataReference&);
</span><span class="cx">
</span><ins>+ virtual ~DataReference() { }
+
</ins><span class="cx"> private:
</span><span class="cx"> const uint8_t* m_data;
</span><span class="cx"> size_t m_size;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class SharedBufferDataReference: public DataReference {
+public:
+ SharedBufferDataReference(WebCore::SharedBuffer* buffer)
+ {
+ m_buffer = buffer;
+ }
+
+ size_t size() const { return m_buffer->size(); }
+ const uint8_t* data() const = delete;
+ Vector<uint8_t> vector() const = delete;
+
+ void encode(ArgumentEncoder&) const override;
+ virtual ~SharedBufferDataReference() { m_buffer = 0; }
+
+private:
+ RefPtr<WebCore::SharedBuffer> m_buffer;
+};
+
</ins><span class="cx"> } // namespace IPC
</span><span class="cx">
</span><span class="cx"> #endif // DataReference_h
</span></span></pre>
</div>
</div>
</body>
</html>