<!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>[170938] 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/170938">170938</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 17:18:17 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make SharedBuffer::append(SharedBuffer*) be smarter about CFData and data arrays
https://bugs.webkit.org/show_bug.cgi?id=134731
Reviewed by Antti Koivisto.
If the target SharedBuffer has a CFDataRef or a data array then we can simply retain that
CFDataRef or data array elements in the SharedBuffer being appended to. This avoids
unnecessary copying.
No new tests because no functional changes.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::maybeAppendPlatformData):
* platform/SharedBuffer.h:
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::maybeAppendPlatformData):
(WebCore::SharedBuffer::maybeAppendDataArray):
* platform/soup/SharedBufferSoup.cpp:
(WebCore::SharedBuffer::maybeAppendPlatformData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformsoupSharedBufferSoupcpp">trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170937 => 170938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 00:18:17 UTC (rev 170938)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-09 Pratik Solanki <psolanki@apple.com>
+
+ Make SharedBuffer::append(SharedBuffer*) be smarter about CFData and data arrays
+ https://bugs.webkit.org/show_bug.cgi?id=134731
+
+ Reviewed by Antti Koivisto.
+
+ If the target SharedBuffer has a CFDataRef or a data array then we can simply retain that
+ CFDataRef or data array elements in the SharedBuffer being appended to. This avoids
+ unnecessary copying.
+
+ No new tests because no functional changes.
+
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::append):
+ (WebCore::SharedBuffer::maybeAppendPlatformData):
+ * platform/SharedBuffer.h:
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::maybeAppendPlatformData):
+ (WebCore::SharedBuffer::maybeAppendDataArray):
+ * platform/soup/SharedBufferSoup.cpp:
+ (WebCore::SharedBuffer::maybeAppendPlatformData):
+
</ins><span class="cx"> 2014-07-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Remove uses of 'bash' in build system
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (170937 => 170938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-07-10 00:18:17 UTC (rev 170938)
</span><span class="lines">@@ -296,6 +296,13 @@
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::append(SharedBuffer* data)
</span><span class="cx"> {
</span><ins>+ if (maybeAppendPlatformData(data))
+ return;
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ if (maybeAppendDataArray(data))
+ return;
+#endif
+
</ins><span class="cx"> const char* segment;
</span><span class="cx"> size_t position = 0;
</span><span class="cx"> while (size_t length = data->getSomeData(segment, position)) {
</span><span class="lines">@@ -512,6 +519,11 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool SharedBuffer::maybeAppendPlatformData(SharedBuffer*)
+{
+ return false;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> utf8Buffer(const String& string)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (170937 => 170938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-07-10 00:18:17 UTC (rev 170938)
</span><span class="lines">@@ -189,6 +189,7 @@
</span><span class="cx">
</span><span class="cx"> void clearPlatformData();
</span><span class="cx"> void maybeTransferPlatformData();
</span><ins>+ bool maybeAppendPlatformData(SharedBuffer*);
</ins><span class="cx">
</span><span class="cx"> void copyBufferAndClear(char* destination, unsigned bytesToCopy) const;
</span><span class="cx">
</span><span class="lines">@@ -201,6 +202,7 @@
</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><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></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (170937 => 170938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-07-10 00:18:17 UTC (rev 170938)
</span><span class="lines">@@ -112,6 +112,14 @@
</span><span class="cx"> m_cfData = newContents->m_cfData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool SharedBuffer::maybeAppendPlatformData(SharedBuffer* newContents)
+{
+ if (size() || !newContents->m_cfData)
+ return false;
+ m_cfData = newContents->m_cfData;
+ return true;
+}
+
</ins><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx"> PassRefPtr<SharedBuffer> SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
</span><span class="cx"> {
</span><span class="lines">@@ -187,6 +195,19 @@
</span><span class="cx">
</span><span class="cx"> return reinterpret_cast<const char*>(CFDataGetBytePtr(m_dataArray.at(0).get()));
</span><span class="cx"> }
</span><ins>+
+bool SharedBuffer::maybeAppendDataArray(SharedBuffer* data)
+{
+ if (m_buffer.size() || m_cfData || !data->m_dataArray.size())
+ return false;
+#if !ASSERT_DISABLED
+ unsigned originalSize = size();
</ins><span class="cx"> #endif
</span><ins>+ for (auto cfData : data->m_dataArray)
+ append(cfData.get());
+ ASSERT(size() == originalSize + data->size());
+ return true;
+}
+#endif
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupSharedBufferSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp (170937 => 170938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-07-10 00:18:17 UTC (rev 170938)
</span><span class="lines">@@ -79,6 +79,11 @@
</span><span class="cx"> return m_soupBuffer->length;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool SharedBuffer::maybeAppendPlatformData(SharedBuffer*)
+{
+ return false;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>