<!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>[182388] 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/182388">182388</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-06 02:55:07 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::Array::copy() should move the resulting Vector<> of copies into the Array::create() call
https://bugs.webkit.org/show_bug.cgi?id=143413
Reviewed by Darin Adler.
Move the Vector<> object containing the copied elements into the Array::create()
call, avoiding copying all the elements again.
While here, change the Vector<> parameters for Array::create() and the Array
constructor to rvalue references. This will ensure that the passed-in object
is moved into the Array::create() call if possible, or explicitly copied
otherwise. The constructor is moved into the header for inlining opportunities
and the unnecessary parameter in the create(Vector<>&&) method declaration
removed.
* Shared/API/APIArray.cpp:
(API::Array::create):
(API::Array::copy):
(API::Array::Array): Deleted.
* Shared/API/APIArray.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIArraycpp">trunk/Source/WebKit2/Shared/API/APIArray.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIArrayh">trunk/Source/WebKit2/Shared/API/APIArray.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182387 => 182388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-06 09:39:21 UTC (rev 182387)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-06 09:55:07 UTC (rev 182388)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-04-06 Žan Doberšek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [WK2] API::Array::copy() should move the resulting Vector<> of copies into the Array::create() call
+ https://bugs.webkit.org/show_bug.cgi?id=143413
+
+ Reviewed by Darin Adler.
+
+ Move the Vector<> object containing the copied elements into the Array::create()
+ call, avoiding copying all the elements again.
+
+ While here, change the Vector<> parameters for Array::create() and the Array
+ constructor to rvalue references. This will ensure that the passed-in object
+ is moved into the Array::create() call if possible, or explicitly copied
+ otherwise. The constructor is moved into the header for inlining opportunities
+ and the unnecessary parameter in the create(Vector<>&&) method declaration
+ removed.
+
+ * Shared/API/APIArray.cpp:
+ (API::Array::create):
+ (API::Array::copy):
+ (API::Array::Array): Deleted.
+ * Shared/API/APIArray.h:
+
+2015-04-06 Žan Doberšek <zdobersek@igalia.com>
+
</ins><span class="cx"> UserScript, UserStyleSheet constructors should take in Vector<String> rvalues
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143411
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIArray.cpp (182387 => 182388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIArray.cpp 2015-04-06 09:39:21 UTC (rev 182387)
+++ trunk/Source/WebKit2/Shared/API/APIArray.cpp 2015-04-06 09:55:07 UTC (rev 182388)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> return create(Vector<RefPtr<Object>>());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Array> Array::create(Vector<RefPtr<Object>> elements)
</del><ins>+PassRefPtr<Array> Array::create(Vector<RefPtr<Object>>&& elements)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new Array(WTF::move(elements)));
</span><span class="cx"> }
</span><span class="lines">@@ -75,14 +75,9 @@
</span><span class="cx"> elements.reserveInitialCapacity(size);
</span><span class="cx"> for (const auto& entry : this->elements())
</span><span class="cx"> elements.uncheckedAppend(entry);
</span><del>- return *Array::create(elements);
</del><ins>+ return *Array::create(WTF::move(elements));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Array::Array(Vector<RefPtr<Object>> elements)
- : m_elements(WTF::move(elements))
-{
-}
-
</del><span class="cx"> Array::~Array()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIArray.h (182387 => 182388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIArray.h 2015-04-06 09:39:21 UTC (rev 182387)
+++ trunk/Source/WebKit2/Shared/API/APIArray.h 2015-04-06 09:55:07 UTC (rev 182388)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<Array> create();
</span><del>- static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
</del><ins>+ static PassRefPtr<Array> create(Vector<RefPtr<Object>>&&);
</ins><span class="cx"> static PassRefPtr<Array> createStringArray(const Vector<WTF::String>&);
</span><span class="cx"> Vector<WTF::String> toStringVector();
</span><span class="cx"> Ref<Array> copy();
</span><span class="lines">@@ -85,7 +85,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit Array(Vector<RefPtr<Object>> elements);
</del><ins>+ explicit Array(Vector<RefPtr<Object>>&& elements)
+ : m_elements(WTF::move(elements))
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<Object>> m_elements;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>