<!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>[205542] 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/205542">205542</a></dd>
<dt>Author</dt> <dd>nael.ouedraogo@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-09-07 03:03:43 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Templatize JS bindings code generator of functions with variadic parameters
https://bugs.webkit.org/show_bug.cgi?id=158835
Reviewed by Darin Adler.
Add template functions to handle function with variadic parameter for DOM objects.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::addTrack):
* Modules/mediastream/RTCPeerConnection.h:
* bindings/js/JSDOMBinding.h:
(WebCore::VariadicHelperBase::convert):
(WebCore::toArguments):
(WebCore::jsFrozenArray):
(WebCore::toRefPtrNativeArray):
(WebCore::toNativeArray):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
(GetVariadicType):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
(WebCore::jsTestObjPrototypeFunctionAny):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::constructJSTestOverloadedConstructors5):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</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>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/ChangeLog 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-09-07 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
+
+ Templatize JS bindings code generator of functions with variadic parameters
+ https://bugs.webkit.org/show_bug.cgi?id=158835
+
+ Reviewed by Darin Adler.
+
+ Add template functions to handle function with variadic parameter for DOM objects.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::addTrack):
+ * Modules/mediastream/RTCPeerConnection.h:
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::VariadicHelperBase::convert):
+ (WebCore::toArguments):
+ (WebCore::jsFrozenArray):
+ (WebCore::toRefPtrNativeArray):
+ (WebCore::toNativeArray):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ (GetVariadicType):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
+ (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+ (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+ (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
+ (WebCore::jsTestObjPrototypeFunctionAny):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ (WebCore::constructJSTestOverloadedConstructors5):
+
</ins><span class="cx"> 2016-09-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205521, r205526, and r205532.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> setConfiguration(rtcConfiguration, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, const Vector<MediaStream*>& streams, ExceptionCode& ec)
</del><ins>+RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(Ref<MediaStreamTrack>&& track, const Vector<std::reference_wrapper<MediaStream>>& streams, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (m_signalingState == SignalingState::Closed) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> mediaStreamIds;
</span><span class="cx"> for (auto stream : streams)
</span><del>- mediaStreamIds.append(stream->id());
</del><ins>+ mediaStreamIds.append(stream.get().id());
</ins><span class="cx">
</span><span class="cx"> RTCRtpSender* sender = nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> // Part of legacy MediaStream-based API (mostly implemented as JS built-ins)
</span><span class="cx"> Vector<RefPtr<MediaStream>> getRemoteStreams() const { return m_backend->getRemoteStreams(); }
</span><span class="cx">
</span><del>- RefPtr<RTCRtpSender> addTrack(Ref<MediaStreamTrack>&&, const Vector<MediaStream*>&, ExceptionCode&);
</del><ins>+ RefPtr<RTCRtpSender> addTrack(Ref<MediaStreamTrack>&&, const Vector<std::reference_wrapper<MediaStream>>&, ExceptionCode&);
</ins><span class="cx"> void removeTrack(RTCRtpSender&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> // This enum is mirrored in RTCRtpTransceiver.h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -296,7 +296,6 @@
</span><span class="cx">
</span><span class="cx"> template<typename T, typename JSType> Vector<RefPtr<T>> toRefPtrNativeArray(JSC::ExecState*, JSC::JSValue);
</span><span class="cx"> template<typename T> Vector<T> toNativeArray(JSC::ExecState&, JSC::JSValue);
</span><del>-template<typename T> Vector<T> toNativeArguments(JSC::ExecState&, size_t startIndex = 0);
</del><span class="cx"> bool hasIteratorMethod(JSC::ExecState&, JSC::JSValue);
</span><span class="cx">
</span><span class="cx"> bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
</span><span class="lines">@@ -324,6 +323,45 @@
</span><span class="cx">
</span><span class="cx"> template<JSC::NativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx">
</span><ins>+template<typename T> struct NativeValueTraits;
+
+template<typename JSClass, typename DOMClass, typename Enable = void>
+struct VariadicHelperBase {
+ using Item = DOMClass;
+
+ static Optional<Item> convert(JSC::ExecState& state, JSC::JSValue jsValue)
+ {
+ typedef NativeValueTraits<DOMClass> TraitsType;
+ DOMClass indexValue;
+ if (!TraitsType::nativeValue(state, jsValue, indexValue))
+ return Nullopt;
+ return indexValue;
+ }
+};
+
+template<typename JSClass, typename DOMClass>
+struct VariadicHelperBase<JSClass, DOMClass, typename std::enable_if<!JSDOMObjectInspector<JSClass>::isBuiltin>::type> {
+ using Class = typename std::remove_reference<decltype(std::declval<JSClass>().wrapped())>::type;
+ using Item = std::reference_wrapper<Class>;
+
+ static Optional<Item> convert(JSC::ExecState&, JSC::JSValue jsValue)
+ {
+ auto* value = JSClass::toWrapped(jsValue);
+ if (!value)
+ return Nullopt;
+ return Optional<Item>(*value);
+ }
+};
+
+template<typename JSClass, typename DOMClass>
+struct VariadicHelper : public VariadicHelperBase<JSClass, DOMClass> {
+ using Item = typename VariadicHelperBase<JSClass, DOMClass>::Item;
+ using Container = Vector<Item>;
+ using Result = typename std::pair<size_t, Optional<Container>>;
+};
+
+template<typename VariadicHelper> typename VariadicHelper::Result toArguments(JSC::ExecState&, size_t startIndex = 0);
+
</ins><span class="cx"> // Inline functions and template definitions.
</span><span class="cx">
</span><span class="cx"> inline JSC::Structure* DOMConstructorObject::createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
</span><span class="lines">@@ -704,8 +742,6 @@
</span><span class="cx"> inline RefPtr<JSC::Float32Array> toFloat32Array(JSC::JSValue value) { return JSC::toNativeTypedView<JSC::Float32Adaptor>(value); }
</span><span class="cx"> inline RefPtr<JSC::Float64Array> toFloat64Array(JSC::JSValue value) { return JSC::toNativeTypedView<JSC::Float64Adaptor>(value); }
</span><span class="cx">
</span><del>-template<typename T> struct NativeValueTraits;
-
</del><span class="cx"> template<> struct NativeValueTraits<String> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState& exec, JSC::JSValue jsValue, String& indexedValue)
</span><span class="cx"> {
</span><span class="lines">@@ -781,24 +817,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> Vector<T> toNativeArguments(JSC::ExecState& exec, size_t startIndex)
-{
- size_t length = exec.argumentCount();
- ASSERT(startIndex <= length);
-
- Vector<T> result;
- result.reserveInitialCapacity(length - startIndex);
- typedef NativeValueTraits<T> TraitsType;
-
- for (size_t i = startIndex; i < length; ++i) {
- T indexValue;
- if (!TraitsType::nativeValue(exec, exec.uncheckedArgument(i), indexValue))
- return Vector<T>();
- result.uncheckedAppend(indexValue);
- }
- return result;
-}
-
</del><span class="cx"> inline String propertyNameToString(JSC::PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!propertyName.isSymbol());
</span><span class="lines">@@ -810,6 +828,24 @@
</span><span class="cx"> return AtomicString(propertyName.uid() ? propertyName.uid() : propertyName.publicName());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename VariadicHelper> typename VariadicHelper::Result toArguments(JSC::ExecState& state, size_t startIndex)
+{
+ size_t length = state.argumentCount();
+ if (startIndex > length)
+ return { 0, Nullopt };
+
+ typename VariadicHelper::Container result;
+ result.reserveInitialCapacity(length - startIndex);
+
+ for (size_t i = startIndex; i < length; ++i) {
+ auto value = VariadicHelper::convert(state, state.uncheckedArgument(i));
+ if (!value)
+ return { i, Nullopt };
+ result.uncheckedAppend(WTFMove(value.value()));
+ }
+ return { length, WTFMove(result) };
+}
+
</ins><span class="cx"> template<JSC::NativeFunction nativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> return JSC::JSValue::encode(JSC::JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -3899,7 +3899,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $functionName = "impl.${functionImplementationName}";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> my $quotedFunctionName;
</span><span class="cx"> if (!$function->signature->extendedAttributes->{"Constructor"}) {
</span><span class="cx"> my $name = $function->signature->name;
</span><span class="lines">@@ -3975,23 +3975,19 @@
</span><span class="cx"> }
</span><span class="cx"> $value = "WTFMove($name)";
</span><span class="cx"> } elsif ($parameter->isVariadic) {
</span><del>- my $nativeElementType = GetNativeType($interface, $type);
- if (!IsNativeType($type)) {
- push(@$outputArray, " Vector<$nativeElementType> $name;\n");
- push(@$outputArray, " ASSERT($argumentIndex <= state->argumentCount());\n");
- push(@$outputArray, " $name.reserveInitialCapacity(state->argumentCount() - $argumentIndex);\n");
- push(@$outputArray, " for (unsigned i = $argumentIndex, count = state->argumentCount(); i < count; ++i) {\n");
- push(@$outputArray, " auto* item = JS${type}::toWrapped(state->uncheckedArgument(i));\n");
- push(@$outputArray, " if (!item)\n");
- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, i, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
- push(@$outputArray, " $name.uncheckedAppend(item);\n");
- push(@$outputArray, " }\n")
- } else {
- push(@$outputArray, " Vector<$nativeElementType> $name = toNativeArguments<$nativeElementType>(*state, $argumentIndex);\n");
</del><ins>+ my ($wrapperType, $wrappedType) = GetVariadicType($interface, $type);
+ push(@$outputArray, " auto $name = toArguments<VariadicHelper<$wrapperType, $wrappedType>>(*state, $argumentIndex);\n");
+
+ if (IsNativeType($type)) {
</ins><span class="cx"> push(@$outputArray, " if (UNLIKELY(state->hadException()))\n");
</span><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><del>- $value = "WTFMove($name)";
</del><ins>+ else {
+ push(@$outputArray, " if (!$name.second)\n");
+ push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $name.first, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
+ }
+ $value = "WTFMove(*$name.second)";
+
</ins><span class="cx"> } elsif ($codeGenerator->IsEnumType($type)) {
</span><span class="cx"> my $className = GetEnumerationClassName($interface, $type);
</span><span class="cx">
</span><span class="lines">@@ -4056,7 +4052,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($type, $parameter->default)) {
</span><span class="cx"> my $defaultValue = $parameter->default;
</span><del>-
</del><ins>+
</ins><span class="cx"> # String-related optimizations.
</span><span class="cx"> if ($codeGenerator->IsStringType($type)) {
</span><span class="cx"> my $useAtomicString = $parameter->extendedAttributes->{"AtomicString"};
</span><span class="lines">@@ -4073,7 +4069,7 @@
</span><span class="cx"> $defaultValue = "$nativeType()" if $defaultValue eq "[]";
</span><span class="cx"> $defaultValue = "JSValue::JSUndefined" if $defaultValue eq "undefined";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $outer = "state->argument($argumentIndex).isUndefined() ? $defaultValue : ";
</span><span class="cx"> $inner = "state->uncheckedArgument($argumentIndex)";
</span><span class="cx"> } elsif ($parameter->isOptional && !defined($parameter->default)) {
</span><span class="lines">@@ -4604,6 +4600,16 @@
</span><span class="cx"> "unsigned short" => "uint16_t",
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+sub GetVariadicType
+{
+ my ($interface, $type) = @_;
+
+ my $wrappedType = IsNativeType($type) ? GetNativeType($interface, $type) : $type;
+ my $wrapperType = IsNativeType($type) ? "JSC::JSValue" : "JS$wrappedType";
+
+ return ($wrapperType, $wrappedType);
+}
+
</ins><span class="cx"> sub GetNativeType
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $type) = @_;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -6475,16 +6475,10 @@
</span><span class="cx"> return throwThisTypeError(*state, throwScope, "TestObject", "overloadedMethod");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- Vector<Blob*> blobArgs;
- ASSERT(0 <= state->argumentCount());
- blobArgs.reserveInitialCapacity(state->argumentCount() - 0);
- for (unsigned i = 0, count = state->argumentCount(); i < count; ++i) {
- auto* item = JSBlob::toWrapped(state->uncheckedArgument(i));
- if (!item)
- return throwArgumentTypeError(*state, throwScope, i, "blobArgs", "TestObject", "overloadedMethod", "Blob");
- blobArgs.uncheckedAppend(item);
- }
- impl.overloadedMethod(WTFMove(blobArgs));
</del><ins>+ auto blobArgs = toArguments<VariadicHelper<JSBlob, Blob>>(*state, 0);
+ if (!blobArgs.second)
+ return throwArgumentTypeError(*state, throwScope, blobArgs.first, "blobArgs", "TestObject", "overloadedMethod", "Blob");
+ impl.overloadedMethod(WTFMove(*blobArgs.second));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7014,10 +7008,10 @@
</span><span class="cx"> auto head = state->argument(0).toWTFString(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- Vector<String> tail = toNativeArguments<String>(*state, 1);
</del><ins>+ auto tail = toArguments<VariadicHelper<JSC::JSValue, String>>(*state, 1);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.variadicStringMethod(WTFMove(head), WTFMove(tail));
</del><ins>+ impl.variadicStringMethod(WTFMove(head), WTFMove(*tail.second));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7037,10 +7031,10 @@
</span><span class="cx"> auto head = convert<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- Vector<double> tail = toNativeArguments<double>(*state, 1);
</del><ins>+ auto tail = toArguments<VariadicHelper<JSC::JSValue, double>>(*state, 1);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.variadicDoubleMethod(WTFMove(head), WTFMove(tail));
</del><ins>+ impl.variadicDoubleMethod(WTFMove(head), WTFMove(*tail.second));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7060,16 +7054,10 @@
</span><span class="cx"> auto head = JSNode::toWrapped(state->argument(0));
</span><span class="cx"> if (UNLIKELY(!head))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "head", "TestObject", "variadicNodeMethod", "Node");
</span><del>- Vector<Node*> tail;
- ASSERT(1 <= state->argumentCount());
- tail.reserveInitialCapacity(state->argumentCount() - 1);
- for (unsigned i = 1, count = state->argumentCount(); i < count; ++i) {
- auto* item = JSNode::toWrapped(state->uncheckedArgument(i));
- if (!item)
- return throwArgumentTypeError(*state, throwScope, i, "tail", "TestObject", "variadicNodeMethod", "Node");
- tail.uncheckedAppend(item);
- }
- impl.variadicNodeMethod(*head, WTFMove(tail));
</del><ins>+ auto tail = toArguments<VariadicHelper<JSNode, Node>>(*state, 1);
+ if (!tail.second)
+ return throwArgumentTypeError(*state, throwScope, tail.first, "tail", "TestObject", "variadicNodeMethod", "Node");
+ impl.variadicNodeMethod(*head, WTFMove(*tail.second));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (205541 => 205542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-09-07 09:59:22 UTC (rev 205541)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-09-07 10:03:43 UTC (rev 205542)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto* castedThis = jsCast<JSTestOverloadedConstructorsConstructor*>(state->callee());
</span><span class="cx"> ASSERT(castedThis);
</span><del>- Vector<int32_t> longArgs = toNativeArguments<int32_t>(*state, 0);
</del><ins>+ auto longArgs = toArguments<VariadicHelper<JSC::JSValue, int32_t>>(*state, 0);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(WTFMove(longArgs));
</span></span></pre>
</div>
</div>
</body>
</html>