<!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>[207674] 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/207674">207674</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 09:12:10 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web IDL] Support unions in our overload resolution algorithm
https://bugs.webkit.org/show_bug.cgi?id=163764
Reviewed by Darin Adler.
Support unions in our overload resolution algorithm as per:
- https://heycam.github.io/webidl/#es-overloads
- https://heycam.github.io/webidl/#dfn-distinguishable
* bindings/scripts/CodeGeneratorJS.pm:
(IsIDLTypeDistinguishableWithUnionForOverloadResolution):
(AreTypesDistinguishableForOverloadResolution):
(GetOverloadThatMatches):
(GenerateOverloadedFunctionOrConstructor):
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/TestObj.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207673 => 207674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-21 16:10:37 UTC (rev 207673)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 16:12:10 UTC (rev 207674)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-10-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [Web IDL] Support unions in our overload resolution algorithm
+ https://bugs.webkit.org/show_bug.cgi?id=163764
+
+ Reviewed by Darin Adler.
+
+ Support unions in our overload resolution algorithm as per:
+ - https://heycam.github.io/webidl/#es-overloads
+ - https://heycam.github.io/webidl/#dfn-distinguishable
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (IsIDLTypeDistinguishableWithUnionForOverloadResolution):
+ (AreTypesDistinguishableForOverloadResolution):
+ (GetOverloadThatMatches):
+ (GenerateOverloadedFunctionOrConstructor):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/TestObj.idl:
+
+2016-10-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> AudioNode.connect(): First parameter should not be nullable
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163773
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207673 => 207674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-21 16:10:37 UTC (rev 207673)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-21 16:12:10 UTC (rev 207674)
</span><span class="lines">@@ -1945,6 +1945,17 @@
</span><span class="cx"> return %allSets;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsIDLTypeDistinguishableWithUnionForOverloadResolution
+{
+ my ($idlType, $unionSubtypes) = @_;
+
+ assert("First type should not be a union") if $idlType->isUnion;
+ for my $unionSubType (@$unionSubtypes) {
+ return 0 unless AreTypesDistinguishableForOverloadResolution($idlType, $unionSubType);
+ }
+ return 1;
+}
+
</ins><span class="cx"> # Determines if two types are distinguishable in the context of overload resolution,
</span><span class="cx"> # according to the Web IDL specification:
</span><span class="cx"> # http://heycam.github.io/webidl/#dfn-distinguishable
</span><span class="lines">@@ -1960,17 +1971,26 @@
</span><span class="cx"> my $type = shift;
</span><span class="cx"> return $codeGenerator->IsFunctionOnlyCallbackInterface($type) || &$isDictionary($type);
</span><span class="cx"> };
</span><del>-
- # FIXME: Add support for union types.
- # idlTypeA and idlTypeB are distinguishable if:
- # - One type is a union type or nullable union type, the other is neither a union type nor a nullable
- # union type, and each member type of the first is distinguishable with the second.
- # - Both types are either a union type or nullable union type, and each member type of the one is
- # distinguishable with each member type of the other.
</del><span class="cx">
</span><span class="cx"> # FIXME: The WebIDL mandates this but this currently does not work because some of our IDL is wrong.
</span><span class="cx"> # return 0 if $idlTypeA->isNullable && $idlTypeB->isNullable;
</span><span class="cx">
</span><ins>+ # Union types: idlTypeA and idlTypeB are distinguishable if:
+ # - Both types are either a union type or nullable union type, and each member type of the one is
+ # distinguishable with each member type of the other.
+ # - One type is a union type or nullable union type, the other is neither a union type nor a nullable
+ # union type, and each member type of the first is distinguishable with the second.
+ if ($idlTypeA->isUnion && $idlTypeB->isUnion) {
+ for my $unionASubType (@{$idlTypeA->subtypes}) {
+ return 0 unless IsIDLTypeDistinguishableWithUnionForOverloadResolution($unionASubType, $idlTypeB->subtypes);
+ }
+ return 1;
+ } elsif ($idlTypeA->isUnion) {
+ return IsIDLTypeDistinguishableWithUnionForOverloadResolution($idlTypeB, $idlTypeA->subtypes);
+ } elsif ($idlTypeB->isUnion) {
+ return IsIDLTypeDistinguishableWithUnionForOverloadResolution($idlTypeA, $idlTypeB->subtypes);
+ }
+
</ins><span class="cx"> return 0 if $idlTypeA->name eq $idlTypeB->name;
</span><span class="cx"> return 0 if $idlTypeA->name eq "object" or $idlTypeB->name eq "object";
</span><span class="cx"> return 0 if $codeGenerator->IsNumericType($idlTypeA->name) && $codeGenerator->IsNumericType($idlTypeB->name);
</span><span class="lines">@@ -2007,7 +2027,13 @@
</span><span class="cx"> for my $tuple (@{$S}) {
</span><span class="cx"> my $idlType = @{@{$tuple}[1]}[$parameterIndex];
</span><span class="cx"> my $optionality = @{@{$tuple}[2]}[$parameterIndex];
</span><del>- return @{$tuple}[0] if $matches->($idlType, $optionality);
</del><ins>+ if ($idlType->isUnion) {
+ for my $idlSubtype (GetFlattenedMemberTypes($idlType)) {
+ return @{$tuple}[0] if $matches->($idlSubtype, $optionality);
+ }
+ } else {
+ return @{$tuple}[0] if $matches->($idlType, $optionality);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2145,13 +2171,17 @@
</span><span class="cx"> for my $tuple (@{$S}) {
</span><span class="cx"> my $overload = @{$tuple}[0];
</span><span class="cx"> my $idlType = @{@{$tuple}[1]}[$d];
</span><del>- my $type = $idlType->name;
- if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type)) {
- if ($type eq "DOMWindow") {
- AddToImplIncludes("JSDOMWindowShell.h");
- &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && (asObject(distinguishingArg)->inherits(JSDOMWindowShell::info()) || asObject(distinguishingArg)->inherits(JSDOMWindow::info()))");
- } else {
- &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS${type}::info())");
</del><ins>+
+ my @idlSubtypes = $idlType->isUnion ? GetFlattenedMemberTypes($idlType) : ( $idlType );
+ for my $idlSubtype (@idlSubtypes) {
+ my $type = $idlSubtype->name;
+ if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type)) {
+ if ($type eq "DOMWindow") {
+ AddToImplIncludes("JSDOMWindowShell.h");
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && (asObject(distinguishingArg)->inherits(JSDOMWindowShell::info()) || asObject(distinguishingArg)->inherits(JSDOMWindow::info()))");
+ } else {
+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS${type}::info())");
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (207673 => 207674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-21 16:10:37 UTC (rev 207673)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-21 16:12:10 UTC (rev 207674)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include "JSSVGPoint.h"
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx"> #include "JSTestCallbackFunction.h"
</span><ins>+#include "JSTestInterface.h"
</ins><span class="cx"> #include "JSTestNode.h"
</span><span class="cx"> #include "JSTestObj.h"
</span><span class="cx"> #include "JSTestStandaloneDictionary.h"
</span><span class="lines">@@ -956,6 +957,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter(JSC::ExecState*);
</span><ins>+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion(JSC::ExecState*);
</ins><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethodWithOptional(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod2(JSC::ExecState*);
</span><span class="lines">@@ -1574,6 +1578,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> { "overloadedMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethod), (intptr_t) (0) } },
</span><span class="cx"> { "overloadedMethodWithOptionalParameter", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter), (intptr_t) (1) } },
</span><ins>+ { "overloadedMethodWithDistinguishingUnion", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion), (intptr_t) (1) } },
+ { "overloadedMethodWith2DistinguishingUnions", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions), (intptr_t) (1) } },
+ { "overloadedMethodWithNonDistinguishingUnion", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion), (intptr_t) (2) } },
</ins><span class="cx"> { "classMethodWithClamp", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionClassMethodWithClamp), (intptr_t) (2) } },
</span><span class="cx"> { "classMethodWithEnforceRange", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionClassMethodWithEnforceRange), (intptr_t) (2) } },
</span><span class="cx"> { "methodWithUnsignedLongSequence", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence), (intptr_t) (1) } },
</span><span class="lines">@@ -6841,6 +6848,188 @@
</span><span class="cx"> return argsCount < 1 ? throwVMError(state, throwScope, createNotEnoughArgumentsError(state)) : throwVMTypeError(state, throwScope);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1Caller>(state, "overloadedMethodWithDistinguishingUnion");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto objectOrNode = convert<IDLUnion<IDLInterface<TestObj>, IDLInterface<TestNode>>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.overloadedMethodWithDistinguishingUnion(WTFMove(objectOrNode));
+ return JSValue::encode(jsUndefined());
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2Caller>(state, "overloadedMethodWithDistinguishingUnion");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto value = convert<IDLLong>(*state, state->uncheckedArgument(0), NormalConversion);
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.overloadedMethodWithDistinguishingUnion(WTFMove(value));
+ return JSValue::encode(jsUndefined());
+}
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion(ExecState* state)
+{
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ UNUSED_PARAM(throwScope);
+ size_t argsCount = std::min<size_t>(1, state->argumentCount());
+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestNode::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion1(state);
+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2(state);
+ return jsTestObjPrototypeFunctionOverloadedMethodWithDistinguishingUnion2(state);
+ }
+ return argsCount < 1 ? throwVMError(state, throwScope, createNotEnoughArgumentsError(state)) : throwVMTypeError(state, throwScope);
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1Caller>(state, "overloadedMethodWith2DistinguishingUnions");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto objectOrNode = convert<IDLUnion<IDLInterface<TestObj>, IDLInterface<TestNode>>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.overloadedMethodWith2DistinguishingUnions(WTFMove(objectOrNode));
+ return JSValue::encode(jsUndefined());
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2Caller>(state, "overloadedMethodWith2DistinguishingUnions");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 1))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto value = convert<IDLUnion<IDLInterface<TestInterface>, IDLDOMString, IDLLong>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.overloadedMethodWith2DistinguishingUnions(WTFMove(value));
+ return JSValue::encode(jsUndefined());
+}
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions(ExecState* state)
+{
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ UNUSED_PARAM(throwScope);
+ size_t argsCount = std::min<size_t>(1, state->argumentCount());
+ if (argsCount == 1) {
+ JSValue distinguishingArg = state->uncheckedArgument(0);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestNode::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions1(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestInterface::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2(state);
+ if (distinguishingArg.isNumber())
+ return jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2(state);
+ return jsTestObjPrototypeFunctionOverloadedMethodWith2DistinguishingUnions2(state);
+ }
+ return argsCount < 1 ? throwVMError(state, throwScope, createNotEnoughArgumentsError(state)) : throwVMTypeError(state, throwScope);
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion1Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion1(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion1Caller>(state, "overloadedMethodWithNonDistinguishingUnion");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion1Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 2))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto objectOrNode = convert<IDLUnion<IDLInterface<TestObj>, IDLInterface<TestNode>>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto object = JSTestObj::toWrapped(state->uncheckedArgument(1));
+ if (UNLIKELY(!object))
+ return throwArgumentTypeError(*state, throwScope, 1, "object", "TestObject", "overloadedMethodWithNonDistinguishingUnion", "TestObj");
+ impl.overloadedMethodWithNonDistinguishingUnion(WTFMove(objectOrNode), *object);
+ return JSValue::encode(jsUndefined());
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion2Caller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion2(ExecState* state)
+{
+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion2Caller>(state, "overloadedMethodWithNonDistinguishingUnion");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion2Caller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ if (UNLIKELY(state->argumentCount() < 2))
+ return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+ auto objectOrNode = convert<IDLUnion<IDLInterface<TestObj>, IDLInterface<TestNode>>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto node = JSTestNode::toWrapped(state->uncheckedArgument(1));
+ if (UNLIKELY(!node))
+ return throwArgumentTypeError(*state, throwScope, 1, "node", "TestObject", "overloadedMethodWithNonDistinguishingUnion", "TestNode");
+ impl.overloadedMethodWithNonDistinguishingUnion(WTFMove(objectOrNode), *node);
+ return JSValue::encode(jsUndefined());
+}
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion(ExecState* state)
+{
+ VM& vm = state->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ UNUSED_PARAM(throwScope);
+ size_t argsCount = std::min<size_t>(2, state->argumentCount());
+ if (argsCount == 2) {
+ JSValue distinguishingArg = state->uncheckedArgument(1);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestObj::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion1(state);
+ if (distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JSTestNode::info()))
+ return jsTestObjPrototypeFunctionOverloadedMethodWithNonDistinguishingUnion2(state);
+ }
+ return argsCount < 2 ? throwVMError(state, throwScope, createNotEnoughArgumentsError(state)) : throwVMTypeError(state, throwScope);
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (207673 => 207674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-21 16:10:37 UTC (rev 207673)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-21 16:12:10 UTC (rev 207674)
</span><span class="lines">@@ -298,6 +298,15 @@
</span><span class="cx">
</span><span class="cx"> void overloadedMethodWithOptionalParameter(DOMString strArg, optional TestObj? objArg = null);
</span><span class="cx"> void overloadedMethodWithOptionalParameter(TestObj? objArg, optional long longArg);
</span><ins>+
+ void overloadedMethodWithDistinguishingUnion((TestObj or TestNode) objectOrNode);
+ void overloadedMethodWithDistinguishingUnion(long value);
+
+ void overloadedMethodWith2DistinguishingUnions((TestObj or TestNode) objectOrNode);
+ void overloadedMethodWith2DistinguishingUnions((TestInterface or DOMString or long) value);
+
+ void overloadedMethodWithNonDistinguishingUnion((TestObj or TestNode) objectOrNode, TestObj object);
+ void overloadedMethodWithNonDistinguishingUnion((TestObj or TestNode) objectOrNode, TestNode node);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Class methods within JavaScript (like what's used for IDBKeyRange).
</span></span></pre>
</div>
</div>
</body>
</html>