<!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>[160546] 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/160546">160546</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 08:27:54 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make some optimizations for DOM bindings involving vectors
https://bugs.webkit.org/show_bug.cgi?id=125680
Reviewed by Andreas Kling.
* bindings/js/JSDOMBinding.h:
(WebCore::toJS): Removed unnecessary copying of vectors when converting them
to JavaScript values.
(WebCore::toRefPtrNativeArray): Use reserveInitialCapacity and uncheckedAppend.
(WebCore::toNativeArray): Ditto.
(WebCore::toNativeArguments): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160545 => 160546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-13 15:41:09 UTC (rev 160545)
+++ trunk/Source/WebCore/ChangeLog 2013-12-13 16:27:54 UTC (rev 160546)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-13 Darin Adler <darin@apple.com>
+
+ Make some optimizations for DOM bindings involving vectors
+ https://bugs.webkit.org/show_bug.cgi?id=125680
+
+ Reviewed by Andreas Kling.
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::toJS): Removed unnecessary copying of vectors when converting them
+ to JavaScript values.
+ (WebCore::toRefPtrNativeArray): Use reserveInitialCapacity and uncheckedAppend.
+ (WebCore::toNativeArray): Ditto.
+ (WebCore::toNativeArguments): Ditto.
+
</ins><span class="cx"> 2013-12-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r155784): [GTK] Some methods incorrectly removed in r155784 and deprecated in r158662
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (160545 => 160546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-13 15:41:09 UTC (rev 160545)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-12-13 16:27:54 UTC (rev 160546)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Vector<T> vector)
</del><ins>+inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T>& vector)
</ins><span class="cx"> {
</span><span class="cx"> JSC::JSArray* array = constructEmptyArray(exec, 0, vector.size());
</span><span class="cx">
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Vector<RefPtr<T>> vector)
</del><ins>+inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<RefPtr<T>>& vector)
</ins><span class="cx"> {
</span><span class="cx"> JSC::JSArray* array = constructEmptyArray(exec, 0, vector.size());
</span><span class="cx">
</span><span class="lines">@@ -513,10 +513,12 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<T>> result;
</span><span class="cx"> JSC::JSArray* array = asArray(value);
</span><del>- for (size_t i = 0; i < array->length(); ++i) {
</del><ins>+ size_t size = array->length();
+ result.reserveInitialCapacity(size);
+ for (size_t i = 0; i < size; ++i) {
</ins><span class="cx"> JSC::JSValue element = array->getIndex(exec, i);
</span><span class="cx"> if (element.inherits(JST::info()))
</span><del>- result.append((*toT)(element));
</del><ins>+ result.uncheckedAppend((*toT)(element));
</ins><span class="cx"> else {
</span><span class="cx"> throwVMError(exec, createTypeError(exec, "Invalid Array element type"));
</span><span class="cx"> return Vector<RefPtr<T>>();
</span><span class="lines">@@ -537,13 +539,14 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* object = value.getObject();
</span><span class="cx"> Vector<T> result;
</span><ins>+ result.reserveInitialCapacity(length);
</ins><span class="cx"> typedef NativeValueTraits<T> TraitsType;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> T indexValue;
</span><span class="cx"> if (!TraitsType::nativeValue(exec, object->get(exec, i), indexValue))
</span><span class="cx"> return Vector<T>();
</span><del>- result.append(indexValue);
</del><ins>+ result.uncheckedAppend(indexValue);
</ins><span class="cx"> }
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -555,13 +558,14 @@
</span><span class="cx"> ASSERT(startIndex <= length);
</span><span class="cx">
</span><span class="cx"> Vector<T> result;
</span><ins>+ result.reserveInitialCapacity(length);
</ins><span class="cx"> typedef NativeValueTraits<T> TraitsType;
</span><span class="cx">
</span><span class="cx"> for (size_t i = startIndex; i < length; ++i) {
</span><span class="cx"> T indexValue;
</span><span class="cx"> if (!TraitsType::nativeValue(exec, exec->argument(i), indexValue))
</span><span class="cx"> return Vector<T>();
</span><del>- result.append(indexValue);
</del><ins>+ result.uncheckedAppend(indexValue);
</ins><span class="cx"> }
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>