<!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>[206090] 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/206090">206090</a></dd>
<dt>Author</dt> <dd>nael.ouedraogo@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-09-19 02:00:38 -0700 (Mon, 19 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSDOMBindings' toArguments() should return a more descriptive object
https://bugs.webkit.org/show_bug.cgi?id=161793
Reviewed by Youenn Fablet.
Replace std::pair with new VariadicHelperResult class with more
readable members names.
No additional tests required.
* bindings/js/JSDOMBinding.h:
(WebCore::VariadicHelper::Result::Result):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):</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>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206089 => 206090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-19 07:23:53 UTC (rev 206089)
+++ trunk/Source/WebCore/ChangeLog 2016-09-19 09:00:38 UTC (rev 206090)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-09-19 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
+
+ JSDOMBindings' toArguments() should return a more descriptive object
+ https://bugs.webkit.org/show_bug.cgi?id=161793
+
+ Reviewed by Youenn Fablet.
+
+ Replace std::pair with new VariadicHelperResult class with more
+ readable members names.
+
+ No additional tests required.
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::VariadicHelper::Result::Result):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
+ (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+ (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+ (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
+
</ins><span class="cx"> 2016-09-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary String allocations in URLParser
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (206089 => 206090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-19 07:23:53 UTC (rev 206089)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-19 09:00:38 UTC (rev 206090)
</span><span class="lines">@@ -356,7 +356,16 @@
</span><span class="cx"> struct VariadicHelper : public VariadicHelperBase<JSClass, DOMClass> {
</span><span class="cx"> using Item = typename VariadicHelperBase<JSClass, DOMClass>::Item;
</span><span class="cx"> using Container = Vector<Item>;
</span><del>- using Result = typename std::pair<size_t, Optional<Container>>;
</del><ins>+
+ struct Result {
+ Result(size_t argumentIndex, Optional<Container>&& arguments)
+ : argumentIndex(argumentIndex)
+ , arguments(WTFMove(arguments))
+ {
+ }
+ size_t argumentIndex;
+ Optional<Container> arguments;
+ };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename VariadicHelper> typename VariadicHelper::Result toArguments(JSC::ExecState&, size_t startIndex = 0);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (206089 => 206090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-19 07:23:53 UTC (rev 206089)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-19 09:00:38 UTC (rev 206090)
</span><span class="lines">@@ -4010,10 +4010,10 @@
</span><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- push(@$outputArray, " if (!$name.second)\n");
- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $name.first, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
</del><ins>+ push(@$outputArray, " if (!$name.arguments)\n");
+ push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $name.argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
</ins><span class="cx"> }
</span><del>- $value = "WTFMove(*$name.second)";
</del><ins>+ $value = "WTFMove($name.arguments.value())";
</ins><span class="cx">
</span><span class="cx"> } elsif ($codeGenerator->IsEnumType($type)) {
</span><span class="cx"> my $className = GetEnumerationClassName($interface, $type);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (206089 => 206090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-19 07:23:53 UTC (rev 206089)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-19 09:00:38 UTC (rev 206090)
</span><span class="lines">@@ -6551,9 +6551,9 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto blobArgs = toArguments<VariadicHelper<JSBlob, Blob>>(*state, 0);
</span><del>- if (!blobArgs.second)
- return throwArgumentTypeError(*state, throwScope, blobArgs.first, "blobArgs", "TestObject", "overloadedMethod", "Blob");
- impl.overloadedMethod(WTFMove(*blobArgs.second));
</del><ins>+ if (!blobArgs.arguments)
+ return throwArgumentTypeError(*state, throwScope, blobArgs.argumentIndex, "blobArgs", "TestObject", "overloadedMethod", "Blob");
+ impl.overloadedMethod(WTFMove(blobArgs.arguments.value()));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7086,7 +7086,7 @@
</span><span class="cx"> auto tail = toArguments<VariadicHelper<JSC::JSValue, String>>(*state, 1);
</span><span class="cx"> if (UNLIKELY(throwScope.exception()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.variadicStringMethod(WTFMove(head), WTFMove(*tail.second));
</del><ins>+ impl.variadicStringMethod(WTFMove(head), WTFMove(tail.arguments.value()));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7109,7 +7109,7 @@
</span><span class="cx"> auto tail = toArguments<VariadicHelper<JSC::JSValue, double>>(*state, 1);
</span><span class="cx"> if (UNLIKELY(throwScope.exception()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.variadicDoubleMethod(WTFMove(head), WTFMove(*tail.second));
</del><ins>+ impl.variadicDoubleMethod(WTFMove(head), WTFMove(tail.arguments.value()));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7130,9 +7130,9 @@
</span><span class="cx"> if (UNLIKELY(!head))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "head", "TestObject", "variadicNodeMethod", "Node");
</span><span class="cx"> auto tail = toArguments<VariadicHelper<JSNode, Node>>(*state, 1);
</span><del>- if (!tail.second)
- return throwArgumentTypeError(*state, throwScope, tail.first, "tail", "TestObject", "variadicNodeMethod", "Node");
- impl.variadicNodeMethod(*head, WTFMove(*tail.second));
</del><ins>+ if (!tail.arguments)
+ return throwArgumentTypeError(*state, throwScope, tail.argumentIndex, "tail", "TestObject", "variadicNodeMethod", "Node");
+ impl.variadicNodeMethod(*head, WTFMove(tail.arguments.value()));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>