<!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>[163444] 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/163444">163444</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-05 04:58:41 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>XMLHttpRequest performs too many copies for ArrayBuffer results
https://bugs.webkit.org/show_bug.cgi?id=117458
Patch by Wojciech Bielawski <w.bielawski@samsung.com> on 2014-02-05
Reviewed by Alexey Proskuryakov.
Based on blink change: https://chromium.googlesource.com/chromium/blink/+/bed266aa5a43f7c080c87e527bd35e2b80ecc7b7
Add SharedBuffer::createArrayBuffer() and use it to create XMLHttpRequest's response in ArrayBuffer
This cuts
- two memsets (in ArrayBuffer::create and SharedBuffer::m_buffer::resize)
- one copy (SharedBuffer::m_buffer to ArrayBufferContents::m_data)
- one allocation (SharedBuffer::m_buffer)
Source/JavaScriptCore:
* runtime/ArrayBuffer.h:
Source/WebCore:
No new tests. WebKit desn't provide test mechanism similar to blink's one.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::createArrayBuffer):
* platform/SharedBuffer.h:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseArrayBuffer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayBufferh">trunk/Source/JavaScriptCore/runtime/ArrayBuffer.h</a></li>
<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="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-05 Wojciech Bielawski <w.bielawski@samsung.com>
+
+ XMLHttpRequest performs too many copies for ArrayBuffer results
+ https://bugs.webkit.org/show_bug.cgi?id=117458
+
+ Reviewed by Alexey Proskuryakov.
+
+ Based on blink change: https://chromium.googlesource.com/chromium/blink/+/bed266aa5a43f7c080c87e527bd35e2b80ecc7b7
+
+ Add SharedBuffer::createArrayBuffer() and use it to create XMLHttpRequest's response in ArrayBuffer
+ This cuts
+ - two memsets (in ArrayBuffer::create and SharedBuffer::m_buffer::resize)
+ - one copy (SharedBuffer::m_buffer to ArrayBufferContents::m_data)
+ - one allocation (SharedBuffer::m_buffer)
+
+ * runtime/ArrayBuffer.h:
+
</ins><span class="cx"> 2014-02-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SVG) guards
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayBuffer.h (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayBuffer.h 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/JavaScriptCore/runtime/ArrayBuffer.h 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> static inline PassRefPtr<ArrayBuffer> create(ArrayBufferContents&);
</span><span class="cx"> static inline PassRefPtr<ArrayBuffer> createAdopted(const void* data, unsigned byteLength);
</span><span class="cx">
</span><del>- // Only for use by Uint8ClampedArray::createUninitialized.
</del><ins>+ // Only for use by Uint8ClampedArray::createUninitialized and SharedBuffer::createArrayBuffer.
</ins><span class="cx"> static inline PassRefPtr<ArrayBuffer> createUninitialized(unsigned numElements, unsigned elementByteSize);
</span><span class="cx">
</span><span class="cx"> inline void* data();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/WebCore/ChangeLog 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-05 Wojciech Bielawski <w.bielawski@samsung.com>
+
+ XMLHttpRequest performs too many copies for ArrayBuffer results
+ https://bugs.webkit.org/show_bug.cgi?id=117458
+
+ Reviewed by Alexey Proskuryakov.
+
+ Based on blink change: https://chromium.googlesource.com/chromium/blink/+/bed266aa5a43f7c080c87e527bd35e2b80ecc7b7
+
+ Add SharedBuffer::createArrayBuffer() and use it to create XMLHttpRequest's response in ArrayBuffer
+ This cuts
+ - two memsets (in ArrayBuffer::create and SharedBuffer::m_buffer::resize)
+ - one copy (SharedBuffer::m_buffer to ArrayBufferContents::m_data)
+ - one allocation (SharedBuffer::m_buffer)
+
+ No new tests. WebKit desn't provide test mechanism similar to blink's one.
+
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::createArrayBuffer):
+ * platform/SharedBuffer.h:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseArrayBuffer):
+
</ins><span class="cx"> 2014-02-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SVG) guards
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -274,6 +274,26 @@
</span><span class="cx"> return this->buffer().data();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<ArrayBuffer> SharedBuffer::createArrayBuffer() const
+{
+ RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::createUninitialized(static_cast<unsigned>(size()), sizeof(char));
+
+ const char* segment = 0;
+ unsigned position = 0;
+ while (unsigned segmentSize = getSomeData(segment, position)) {
+ memcpy(static_cast<char*>(arrayBuffer->data()) + position, segment, segmentSize);
+ position += segmentSize;
+ }
+
+ if (position != arrayBuffer->byteLength()) {
+ ASSERT_NOT_REACHED();
+ // Don't return the incomplete ArrayBuffer.
+ return 0;
+ }
+
+ return arrayBuffer.release();
+}
+
</ins><span class="cx"> void SharedBuffer::append(SharedBuffer* data)
</span><span class="cx"> {
</span><span class="cx"> const char* segment;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #ifndef SharedBuffer_h
</span><span class="cx"> #define SharedBuffer_h
</span><span class="cx">
</span><ins>+#include <runtime/ArrayBuffer.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -99,6 +100,9 @@
</span><span class="cx"> // to be merged into a flat buffer. Use getSomeData() whenever possible
</span><span class="cx"> // for better performance.
</span><span class="cx"> const char* data() const;
</span><ins>+ // Creates an ArrayBuffer and copies this SharedBuffer's contents to that
+ // ArrayBuffer without merging segmented buffers into a flat buffer.
+ PassRefPtr<ArrayBuffer> createArrayBuffer() const;
</ins><span class="cx">
</span><span class="cx"> unsigned size() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (163443 => 163444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-02-05 12:57:39 UTC (rev 163443)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-02-05 12:58:41 UTC (rev 163444)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_responseArrayBuffer) {
</span><span class="cx"> if (m_binaryResponseBuilder)
</span><del>- m_responseArrayBuffer = ArrayBuffer::create(const_cast<char*>(m_binaryResponseBuilder->data()), static_cast<unsigned>(m_binaryResponseBuilder->size()));
</del><ins>+ m_responseArrayBuffer = m_binaryResponseBuilder->createArrayBuffer();
</ins><span class="cx"> else
</span><span class="cx"> m_responseArrayBuffer = ArrayBuffer::create(nullptr, 0);
</span><span class="cx"> m_binaryResponseBuilder.clear();
</span></span></pre>
</div>
</div>
</body>
</html>