Changeset 206956 in webkit

Timestamp:

Oct 8, 2016 12:07:14 PM (8 years ago)

Author:

weinig@apple.com

Message:

Autogenerate passing union types as part of a functions variadic arguments
​https://bugs.webkit.org/show_bug.cgi?id=162919

Reviewed by Darin Adler.

• CMakeLists.txt:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSBindingsAllInOne.cpp:

Remove deleted files.

• bindings/generic/IDLTypes.h:

Switch to use std::reference_wrapper as it's implementation type. We may need more
granularity here in the future, but this will work for now.

• bindings/js/JSCharacterDataCustom.cpp: Removed.
• bindings/js/JSDocumentTypeCustom.cpp: Removed.
• bindings/js/JSNodeOrString.cpp: Removed.
• bindings/js/JSNodeOrString.h: Removed.

• bindings/js/JSDOMBinding.h:

(WebCore::VariadicHelperBase::convert): Deleted.
(WebCore::toArguments): Deleted.
Moved to JSDOMConvert.h and renamed to convertVariadicArguments and make
it work in terms of IDLTypes.

• bindings/js/JSDOMConvert.h:

(WebCore::Converter<IDLInterface<T>>::convert):
(WebCore::VariadicConverterBase::convert):
(WebCore::VariadicConverterBase<IDLInterface<T>>::convert):
(WebCore::convertVariadicArguments):

• bindings/js/JSDocumentCustom.cpp:

(WebCore::JSDocument::prepend): Deleted.
(WebCore::JSDocument::append): Deleted.

• bindings/js/JSDocumentFragmentCustom.cpp:

(WebCore::JSDocumentFragment::prepend): Deleted.
(WebCore::JSDocumentFragment::append): Deleted.

• bindings/js/JSElementCustom.cpp:

(WebCore::JSElement::before): Deleted.
(WebCore::JSElement::after): Deleted.
(WebCore::JSElement::replaceWith): Deleted.
(WebCore::JSElement::prepend): Deleted.
(WebCore::JSElement::append): Deleted.
Remove now generated functions.

• bindings/scripts/CodeGenerator.pm:

(assert):
Add assert to help debugging.

(ParseInterface):
Don't treat union types as interfaces.

(GetFlattenedMemberTypes):
(GetNumberOfNullableMemberTypes):
(GetIDLUnionMemberTypes):
Implement WebIDL algorithms for getting the flattened member list of union, and use it
to construct the c++ IDLType.

(GetBaseIDLType):
(GetIDLType):
Add helper to convert an parsed idlType to a c++ IDLType.

(IsWrapperType):
Don't treat union types as wrappers.

• bindings/scripts/CodeGeneratorJS.pm:

(AddToImplIncludesForIDLType):
Add helper for adding #includes based on a parsed idlType. It recursively handles union types.

(GenerateParametersCheck):
Use the new convertVariadicArguments function to handle all variadic arguments, including
union types.

• bindings/scripts/IDLParser.pm:

(parseDictionaryMember):
(parseAttributeRest):
(parseOptionalOrRequiredArgument):
(parseExceptionField):
Add an idlType to domSignature and populate it.

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjPrototypeFunctionOverloadedMethod13):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicUnionMethod):

• bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:

(WebCore::constructJSTestOverloadedConstructors5):

• bindings/scripts/test/TestObj.idl:

Add and update tests.

• dom/ChildNode.idl:
• dom/ParentNode.idl:

Remove Custom extended attribute.

• dom/ContainerNode.cpp:
• dom/ContainerNode.h:
• dom/Node.cpp:
• dom/Node.h:

Switch to using std::reference_wrapper instead of Ref<> for passed in parameters.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• bindings/generic/IDLTypes.h (modified) (1 diff)
• bindings/js/JSBindingsAllInOne.cpp (modified) (3 diffs)
• bindings/js/JSCharacterDataCustom.cpp (deleted)
• bindings/js/JSDOMBinding.h (modified) (2 diffs)
• bindings/js/JSDOMConvert.h (modified) (3 diffs)
• bindings/js/JSDocumentCustom.cpp (modified) (2 diffs)
• bindings/js/JSDocumentFragmentCustom.cpp (modified) (2 diffs)
• bindings/js/JSDocumentTypeCustom.cpp (deleted)
• bindings/js/JSElementCustom.cpp (modified) (2 diffs)
• bindings/js/JSNodeOrString.cpp (deleted)
• bindings/js/JSNodeOrString.h (deleted)
• bindings/scripts/CodeGenerator.pm (modified) (9 diffs)
• bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• bindings/scripts/IDLParser.pm (modified) (7 diffs)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (7 diffs)
• bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (modified) (2 diffs)
• bindings/scripts/test/TestObj.idl (modified) (1 diff)
• dom/ChildNode.idl (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (2 diffs)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Node.cpp (modified) (6 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/ParentNode.idl (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -1069 +1069 @@
     bindings/js/JSCallbackData.cpp
     bindings/js/JSCanvasRenderingContext2DCustom.cpp
-    bindings/js/JSCharacterDataCustom.cpp
     bindings/js/JSClientRectCustom.cpp
     bindings/js/JSCommandLineAPIHostCustom.cpp
@@ -1106 +1105 @@
     bindings/js/JSDocumentCustom.cpp
     bindings/js/JSDocumentFragmentCustom.cpp
-    bindings/js/JSDocumentTypeCustom.cpp
     bindings/js/JSElementCustom.cpp
     bindings/js/JSErrorEventCustom.cpp
@@ -1159 +1157 @@
     bindings/js/JSNodeFilterCustom.cpp
     bindings/js/JSNodeIteratorCustom.cpp
-    bindings/js/JSNodeOrString.cpp
     bindings/js/JSNodeListCustom.cpp
     bindings/js/JSPerformanceEntryCustom.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-06  Sam Weinig  <sam@webkit.org>
+
+        Autogenerate passing union types as part of a functions variadic arguments
+        https://bugs.webkit.org/show_bug.cgi?id=162919
+
+        Reviewed by Darin Adler.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSBindingsAllInOne.cpp:
+        Remove deleted files.
+
+        * bindings/generic/IDLTypes.h:
+        Switch to use std::reference_wrapper as it's implementation type. We may need more
+        granularity here in the future, but this will work for now.
+
+        * bindings/js/JSCharacterDataCustom.cpp: Removed.
+        * bindings/js/JSDocumentTypeCustom.cpp: Removed.
+        * bindings/js/JSNodeOrString.cpp: Removed.
+        * bindings/js/JSNodeOrString.h: Removed.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::VariadicHelperBase::convert): Deleted.
+        (WebCore::toArguments): Deleted.
+        Moved to JSDOMConvert.h and renamed to convertVariadicArguments and make
+        it work in terms of IDLTypes.
+
+        * bindings/js/JSDOMConvert.h:
+        (WebCore::Converter<IDLInterface<T>>::convert):
+        (WebCore::VariadicConverterBase::convert):
+        (WebCore::VariadicConverterBase<IDLInterface<T>>::convert):
+        (WebCore::convertVariadicArguments):
+
+        * bindings/js/JSDocumentCustom.cpp:
+        (WebCore::JSDocument::prepend): Deleted.
+        (WebCore::JSDocument::append): Deleted.
+        * bindings/js/JSDocumentFragmentCustom.cpp:
+        (WebCore::JSDocumentFragment::prepend): Deleted.
+        (WebCore::JSDocumentFragment::append): Deleted.
+        * bindings/js/JSElementCustom.cpp:
+        (WebCore::JSElement::before): Deleted.
+        (WebCore::JSElement::after): Deleted.
+        (WebCore::JSElement::replaceWith): Deleted.
+        (WebCore::JSElement::prepend): Deleted.
+        (WebCore::JSElement::append): Deleted.
+        Remove now generated functions.
+
+        * bindings/scripts/CodeGenerator.pm:
+        (assert):
+        Add assert to help debugging.
+
+        (ParseInterface):
+        Don't treat union types as interfaces.
+
+        (GetFlattenedMemberTypes):
+        (GetNumberOfNullableMemberTypes):
+        (GetIDLUnionMemberTypes):
+        Implement WebIDL algorithms for getting the flattened member list of union, and use it
+        to construct the c++ IDLType.
+
+        (GetBaseIDLType):
+        (GetIDLType):
+        Add helper to convert an parsed idlType to a c++ IDLType.
+
+        (IsWrapperType):
+        Don't treat union types as wrappers.
+        
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (AddToImplIncludesForIDLType):
+        Add helper for adding #includes based on a parsed idlType. It recursively handles union types.
+
+        (GenerateParametersCheck):
+        Use the new convertVariadicArguments function to handle all variadic arguments, including
+        union types.
+
+        * bindings/scripts/IDLParser.pm:
+        (parseDictionaryMember):
+        (parseAttributeRest):
+        (parseOptionalOrRequiredArgument):
+        (parseExceptionField):
+        Add an idlType to domSignature and populate it.
+
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod13):
+        (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicUnionMethod):
+        * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+        (WebCore::constructJSTestOverloadedConstructors5):
+        * bindings/scripts/test/TestObj.idl:
+        Add and update tests.
+
+        * dom/ChildNode.idl:
+        * dom/ParentNode.idl:
+        Remove Custom extended attribute.
+
+        * dom/ContainerNode.cpp:
+        * dom/ContainerNode.h:
+        * dom/Node.cpp:
+        * dom/Node.h:
+        Switch to using std::reference_wrapper instead of Ref<> for passed in parameters.
+
 2016-10-08  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2738 +2738 @@
                 7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */; };
                 7C2BDD3E17C7F98C0038FF15 /* JSDOMGlobalObjectTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */; };
-                7C33F35A1B4A044800502CAF /* JSCharacterDataCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */; };
-                7C33F35E1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */; };
                 7C33F3621B4A050400502CAF /* JSDocumentFragmentCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */; };
                 7C3A91E61C963B8800D1A7E3 /* ClipboardAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3A91E51C963B8800D1A7E3 /* ClipboardAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2773 +2771 @@
                 7C7941E51C56C29300A4C58E /* DataDetectorsCoreSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C7941E31C56C29300A4C58E /* DataDetectorsCoreSoftLink.h */; };
                 7C83DE861D04CC5D00FEBCF3 /* SpringSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C83DE851D04CBD400FEBCF3 /* SpringSolver.h */; };
-                7C91A38F1B498ABE003F9EFA /* JSNodeOrString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */; };
-                7C91A3901B498ABE003F9EFA /* JSNodeOrString.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */; };
                 7C93F3491AA6BA5E00A98BAB /* CompiledContentExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C93F3471AA6BA5E00A98BAB /* CompiledContentExtension.cpp */; };
                 7C93F34A1AA6BA5E00A98BAB /* CompiledContentExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C93F3481AA6BA5E00A98BAB /* CompiledContentExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -9850 +9846 @@
                 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGlobalObjectTask.cpp; sourceTree = "<group>"; };
                 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGlobalObjectTask.h; sourceTree = "<group>"; };
-                7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCharacterDataCustom.cpp; sourceTree = "<group>"; };
-                7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentTypeCustom.cpp; sourceTree = "<group>"; };
                 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentFragmentCustom.cpp; sourceTree = "<group>"; };
                 7C3A91E51C963B8800D1A7E3 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };
@@ -9897 +9891 @@
                 7C7941E31C56C29300A4C58E /* DataDetectorsCoreSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsCoreSoftLink.h; sourceTree = "<group>"; };
                 7C83DE851D04CBD400FEBCF3 /* SpringSolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpringSolver.h; sourceTree = "<group>"; };
-                7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeOrString.cpp; sourceTree = "<group>"; };
-                7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNodeOrString.h; sourceTree = "<group>"; };
                 7C93F3471AA6BA5E00A98BAB /* CompiledContentExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompiledContentExtension.cpp; sourceTree = "<group>"; };
                 7C93F3481AA6BA5E00A98BAB /* CompiledContentExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompiledContentExtension.h; sourceTree = "<group>"; };
@@ -21102 +21094 @@
                                 C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */,
                                 C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */,
-                                7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */,
-                                7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */,
                                 CB38FD551CD21D5B00592A3F /* JSPerformanceEntryCustom.cpp */,
                                 93B70D4F09EB0C7C009D8468 /* JSPluginElementFunctions.cpp */,
@@ -21155 +21145 @@
                                 8931DE5A14C44C44000DC9D2 /* JSBlobCustom.cpp */,
                                 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
-                                7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */,
                                 46A58AC41D46B3FA00432036 /* JSClientRectCustom.cpp */,
                                 A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
@@ -21177 +21166 @@
                                 ADDA94BF19686F8000453029 /* JSDocumentCustom.h */,
                                 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */,
-                                7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */,
                                 A9C6E6460D7465CA006442E9 /* JSDOMMimeTypeArrayCustom.cpp */,
                                 A9C6E64A0D7465E7006442E9 /* JSDOMPluginArrayCustom.cpp */,
@@ -25264 +25252 @@
                                 BCD9C2C30C17B69E005C90A2 /* JSNodeList.h in Headers */,
                                 AD20B18D18E9D237005A8083 /* JSNodeListCustom.h in Headers */,
-                                7C91A3901B498ABE003F9EFA /* JSNodeOrString.h in Headers */,
                                 33503CA410179AD7003B47E1 /* JSNotification.h in Headers */,
                                 33503CA610179AD7003B47E1 /* JSNotificationCenter.h in Headers */,
@@ -28649 +28636 @@
                                 FDA15EA312B03EE1003A583A /* JSChannelSplitterNode.cpp in Sources */,
                                 65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */,
-                                7C33F35A1B4A044800502CAF /* JSCharacterDataCustom.cpp in Sources */,
                                 BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */,
                                 46A58AC51D46B3FA00432036 /* JSClientRectCustom.cpp in Sources */,
@@ -28721 +28707 @@
                                 1221E05F1C02B444006A1A00 /* JSDocumentTimeline.cpp in Sources */,
                                 65DF31F509D1CC60000BE325 /* JSDocumentType.cpp in Sources */,
-                                7C33F35E1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp in Sources */,
                                 1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */,
                                 93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */,
@@ -28984 +28969 @@
                                 BCD9C2C20C17B69E005C90A2 /* JSNodeList.cpp in Sources */,
                                 BCD9C2650C17AA67005C90A2 /* JSNodeListCustom.cpp in Sources */,
-                                7C91A38F1B498ABE003F9EFA /* JSNodeOrString.cpp in Sources */,
                                 33503CA310179AD7003B47E1 /* JSNotification.cpp in Sources */,
                                 33503CA510179AD7003B47E1 /* JSNotificationCenter.cpp in Sources */,

trunk/Source/WebCore/bindings/generic/IDLTypes.h

@@ -85 +85 @@
 struct IDLObject : IDLUnsupportedType { };
 
-template<typename T> struct IDLInterface : IDLType<Ref<T>> {
+template<typename T> struct IDLInterface : IDLType<std::reference_wrapper<T>> {
     using RawType = T;
-    using NullableType = RefPtr<T>;
+    using NullableType = T*;
 };
 

trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -42 +42 @@
 #include "JSCallbackData.cpp"
 #include "JSCanvasRenderingContext2DCustom.cpp"
-#include "JSCharacterDataCustom.cpp"
 #include "JSClientRectCustom.cpp"
 #include "JSCommandLineAPIHostCustom.cpp"
@@ -70 +69 @@
 #include "JSDocumentCustom.cpp"
 #include "JSDocumentFragmentCustom.cpp"
-#include "JSDocumentTypeCustom.cpp"
 #include "JSElementCustom.cpp"
 #include "JSErrorEventCustom.cpp"
@@ -115 +113 @@
 #include "JSNodeIteratorCustom.cpp"
 #include "JSNodeListCustom.cpp"
-#include "JSNodeOrString.cpp"
 #include "JSPluginElementFunctions.cpp"
 #include "JSPopStateEventCustom.cpp"

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -343 +343 @@
 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>;
-
-    struct Result {
-        size_t argumentIndex;
-        Optional<Container> arguments;
-    };
-};
-
-template<typename VariadicHelper> typename VariadicHelper::Result toArguments(JSC::ExecState&, size_t startIndex = 0);
 
 enum class CastedThisErrorBehavior { Throw, ReturnEarly };
@@ -917 +877 @@
 }
 
-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) };
-}
-
 template<JSC::NativeFunction nativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName)
 {

trunk/Source/WebCore/bindings/js/JSDOMConvert.h

@@ -44 +44 @@
 template<typename T> Optional<T> convertDictionary(JSC::ExecState&, JSC::JSValue);
 
+// Used for IDL enumerations.
+template<typename T> Optional<T> parse(JSC::ExecState&, JSC::JSValue);
+template<typename T> const char* expectedEnumerationValues();
+
 enum class IsNullable { No, Yes };
 template<typename T, typename JST> T* convertWrapperType(JSC::ExecState&, JSC::JSValue, IsNullable);
@@ -109 +113 @@
     {
         return valueToUSVString(&state, value);
+    }
+};
+
+template<typename T> struct Converter<IDLInterface<T>> : DefaultConverter<T*> {
+    static T* convert(JSC::ExecState& state, JSC::JSValue value)
+    {
+        return convertWrapperType<T, typename JSDOMWrapperConverterTraits<T>::WrapperClass>(state, value, IsNullable::No);
     }
 };
@@ -409 +420 @@
 };
 
-// Used for IDL enumerations.
-template<typename T> Optional<T> parse(JSC::ExecState&, JSC::JSValue);
-template<typename T> const char* expectedEnumerationValues();
+template<typename IDLType> 
+struct VariadicConverterBase;
+
+template<typename IDLType> 
+struct VariadicConverterBase {
+    using Item = typename IDLType::ImplementationType;
+
+    static Optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
+    {
+        auto& vm = state.vm();
+        auto scope = DECLARE_THROW_SCOPE(vm);
+
+        auto result = Converter<IDLType>::convert(state, value);
+        RETURN_IF_EXCEPTION(scope, Nullopt);
+
+        return result;
+    }
+};
+
+template<typename T>
+struct VariadicConverterBase<IDLInterface<T>> {
+    using Item = typename IDLInterface<T>::ImplementationType;
+
+    static Optional<Item> convert(JSC::ExecState& state, JSC::JSValue value)
+    {
+        auto* result = Converter<IDLInterface<T>>::convert(state, value);
+        if (!result)
+            return Nullopt;
+        return Optional<Item>(*result);
+    }
+};
+
+template<typename IDLType>
+struct VariadicConverter : VariadicConverterBase<IDLType> {
+    using Item = typename VariadicConverterBase<IDLType>::Item;
+    using Container = Vector<Item>;
+
+    struct Result {
+        size_t argumentIndex;
+        Optional<Container> arguments;
+    };
+};
+
+template<typename IDLType> typename VariadicConverter<IDLType>::Result convertVariadicArguments(JSC::ExecState& state, size_t startIndex)
+{
+    size_t length = state.argumentCount();
+    if (startIndex > length)
+        return { 0, Nullopt };
+
+    typename VariadicConverter<IDLType>::Container result;
+    result.reserveInitialCapacity(length - startIndex);
+
+    for (size_t i = startIndex; i < length; ++i) {
+        auto value = VariadicConverter<IDLType>::convert(state, state.uncheckedArgument(i));
+        if (!value)
+            return { i, Nullopt };
+        result.uncheckedAppend(WTFMove(*value));
+    }
+
+    return { length, WTFMove(result) };
+}
 
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp

@@ -30 +30 @@
 #include "JSHTMLDocument.h"
 #include "JSLocation.h"
-#include "JSNodeOrString.h"
 #include "JSXMLDocument.h"
 #include "Location.h"
@@ -109 +108 @@
 }
 
-JSValue JSDocument::prepend(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().prepend(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSDocument::append(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().append(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
 #if ENABLE(TOUCH_EVENTS)
 JSValue JSDocument::createTouchList(ExecState& state)

trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp

@@ -28 +28 @@
 
 #include "ExceptionCode.h"
-#include "JSNodeOrString.h"
 #include "JSShadowRoot.h"
 
@@ -34 +33 @@
 
 namespace WebCore {
-
-JSValue JSDocumentFragment::prepend(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().prepend(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSDocumentFragment::append(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().append(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
 
 JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<DocumentFragment>&& impl)

trunk/Source/WebCore/bindings/js/JSElementCustom.cpp

@@ -39 +39 @@
 #include "JSHTMLElementWrapperFactory.h"
 #include "JSNodeList.h"
-#include "JSNodeOrString.h"
 #include "JSSVGElementWrapperFactory.h"
 #include "NodeList.h"
@@ -76 +75 @@
 }
 
-JSValue JSElement::before(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().before(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSElement::after(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().after(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSElement::replaceWith(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().replaceWith(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSElement::prepend(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().prepend(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
-JSValue JSElement::append(ExecState& state)
-{
-    ExceptionCode ec = 0;
-    wrapped().append(toNodeOrStringVector(state), ec);
-    setDOMException(&state, ec);
-
-    return jsUndefined();
-}
-
 } // namespace WebCore

trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm

@@ -30 +30 @@
 
 use File::Find;
+use Carp qw<longmess>;
+use Data::Dumper;
 
 my $useDocument = "";
@@ -141 +143 @@
 my $cachedExternalDictionaries = {};
 
+sub assert
+{
+    my $message = shift;
+    
+    my $mess = longmess();
+    print Dumper($mess);
+
+    die $message;
+}
+
 # Default constructor
 sub new
@@ -322 +334 @@
 
     return undef if $interfaceName eq 'Object';
+    return undef if $interfaceName eq 'UNION';
 
     if (exists $cachedInterfaces->{$interfaceName}) {
@@ -329 +342 @@
     # Step #1: Find the IDL file associated with 'interface'
     my $filename = $object->IDLFileForInterface($interfaceName)
-        or die("Could NOT find IDL file for interface \"$interfaceName\", reachable from \"" . $outerInterface->name . "\"!\n");
+        or assert("Could NOT find IDL file for interface \"$interfaceName\", reachable from \"" . $outerInterface->name . "\"!\n");
 
     print "  |  |>  Parsing parent IDL \"$filename\" for interface \"$interfaceName\"\n" if $verbose;
@@ -663 +676 @@
     return $object->GetFrozenArrayInnerType($type) if $object->IsFrozenArrayType($type);
     return "";
+}
+
+# http://heycam.github.io/webidl/#dfn-flattened-union-member-types
+sub GetFlattenedMemberTypes
+{
+    my ($object, $idlUnionType) = @_;
+
+    my @flattenedMemberTypes = ();
+
+    foreach my $memberType (@{$idlUnionType->subtypes}) {
+        if ($memberType->isUnion) {
+            push(@flattenedMemberTypes, $object->GetFlattenedMemberTypes($memberType));
+        } else {
+            push(@flattenedMemberTypes, $memberType);
+        }
+    }
+
+    return @flattenedMemberTypes;
+}
+
+# http://heycam.github.io/webidl/#dfn-number-of-nullable-member-types
+sub GetNumberOfNullableMemberTypes
+{
+    my ($object, $idlUnionType) = @_;
+
+    my $count = 0;
+
+    foreach my $memberType (@{$idlUnionType->subtypes}) {
+        $count++ if $memberType->isNullable;
+        $count += $object->GetNumberOfNullableMemberTypes($memberType) if $memberType->isUnion;
+    }
+
+    return $count;
+}
+
+sub GetIDLUnionMemberTypes
+{
+    my ($object, $interface, $idlUnionType) = @_;
+
+    my $numberOfNullableMembers = $object->GetNumberOfNullableMemberTypes($idlUnionType);
+    assert("Union types must only have 0 or 1 nullable types.") if $numberOfNullableMembers > 1;
+
+    my @idlUnionMemberTypes = ();
+
+    push(@idlUnionMemberTypes, "IDLNull") if $numberOfNullableMembers == 1;
+
+    foreach my $memberType ($object->GetFlattenedMemberTypes($idlUnionType)) {
+        push(@idlUnionMemberTypes, $object->GetBaseIDLType($interface, $memberType));
+    }
+
+    return @idlUnionMemberTypes;
+}
+
+sub GetBaseIDLType
+{
+    my ($object, $interface, $idlType) = @_;
+
+    my %IDLTypes = (
+        "any" => "IDLAny",
+        "boolean" => "IDLBoolean",
+        "byte" => "IDLByte",
+        "octet" => "IDLOctet",
+        "short" => "IDLShort",
+        "unsigned short" => "IDLUnsignedShort",
+        "long" => "IDLLong",
+        "unsigned long" => "IDLUnsignedLong",
+        "long long" => "IDLLongLong",
+        "unsigned long long" => "IDLUnsignedLongLong",
+        "float" => "IDLFloat",
+        "unrestricted float" => "IDLUnrestrictedFloat",
+        "double" => "IDLDouble",
+        "unrestricted double" => "IDLUnrestrictedDouble",
+        "DOMString" => "IDLDOMString",
+        "ByteString" => "IDLByteString",
+        "USVString" => "IDLUSVString",
+    );
+
+    return $IDLTypes{$idlType->name} if exists $IDLTypes{$idlType->name};
+    return "IDLEnumeration<" . $object->GetEnumerationClassName($interface, $idlType->name) . ">" if $object->IsEnumType($idlType->name);
+    return "IDLDictionary<" . $object->GetDictionaryClassName($interface, $idlType->name) . ">" if $object->IsDictionaryType($idlType->name);
+    return "IDLSequence<" . $object->GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $object->IsSequenceType($idlType->name);
+    return "IDLFrozenArray<" . $object->GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $object->IsFrozenArrayType($idlType->name);
+    return "IDLUnion<" . join(", ", $object->GetIDLUnionMemberTypes($interface, $idlType)) . ">" if $idlType->isUnion;
+    return "IDLInterface<" . $idlType->name . ">";
+}
+
+sub GetIDLType
+{
+    my ($object, $interface, $idlType) = @_;
+
+    my $baseIDLType = $object->GetBaseIDLType($interface, $idlType);
+    return "IDLNullable<" . $baseIDLType . ">" if $idlType->isNullable;
+    return $baseIDLType;
 }
 
@@ -854 +960 @@
     return 0 if !$object->IsRefPtrType($type);
     return 0 if $object->IsTypedArrayType($type);
+    return 0 if $type eq "UNION";
     return 0 if $webCoreTypeHash{$type};
 
@@ -867 +974 @@
     my $interfaceName = shift;
 
-    my $idlFile = $object->IDLFileForInterface($interfaceName) or die("Could NOT find IDL file for interface \"$interfaceName\"!\n");
+    my $idlFile = $object->IDLFileForInterface($interfaceName) or assert("Could NOT find IDL file for interface \"$interfaceName\"!\n");
 
     open FILE, "<", $idlFile or die;
@@ -899 +1006 @@
   return 0 unless $object->IsWrapperType($type);
 
-  my $idlFile = $object->IDLFileForInterface($type) or die("Could NOT find IDL file for interface \"$type\"!\n");
+  my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
 
   open FILE, "<", $idlFile or die;
@@ -935 +1042 @@
   return 0 unless $object->IsCallbackInterface($type);
 
-  my $idlFile = $object->IDLFileForInterface($type) or die("Could NOT find IDL file for interface \"$type\"!\n");
+  my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
 
   open FILE, "<", $idlFile or die;

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -246 +246 @@
         # default, include the same named file
         $includesRef->{"${type}.h"} = 1;
+    }
+}
+
+sub AddToImplIncludesForIDLType
+{
+    my ($idlType, $conditional) = @_;
+
+    return if $codeGenerator->SkipIncludeHeader($idlType->name);
+
+    if ($idlType->isUnion) {
+        AddToImplIncludes("<wtf/Variant.h>", $conditional);
+
+        foreach my $memberType (@{$idlType->subtypes}) {
+            AddToImplIncludesForIDLType($memberType, $conditional);
+        }
+
+        return;
+    }
+
+    if ($codeGenerator->IsWrapperType($idlType->name)) {
+        AddToImplIncludes("JS" . $idlType->name . ".h");
+        return;
     }
 }
@@ -4011 +4033 @@
     foreach my $parameter (@{$function->parameters}) {
         my $type = $parameter->type;
+        my $idlType = $parameter->idlType;
 
         die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($type);
@@ -4072 +4095 @@
             $value = "WTFMove($name)";
         } elsif ($parameter->isVariadic) {
-            AddToImplIncludes("JS${type}.h", $function->signature->extendedAttributes->{Conditional}) unless $codeGenerator->SkipIncludeHeader($type) or !$codeGenerator->IsWrapperType($type);
-            my ($wrapperType, $wrappedType) = GetVariadicType($interface, $type);
-            push(@$outputArray, "    auto $name = toArguments<VariadicHelper<$wrapperType, $wrappedType>>(*state, $argumentIndex);\n");
-
-            if (IsNativeType($type)) {
-                push(@$outputArray, "    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
-            }
-            else {
-                push(@$outputArray, "    if (!$name.arguments)\n");
-                push(@$outputArray, "        return throwArgumentTypeError(*state, throwScope, $name.argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
-            }
+            $implIncludes{"JSDOMConvert.h"} = 1;
+            AddToImplIncludesForIDLType($idlType, $function->signature->extendedAttributes->{Conditional});
+        
+            my $metaType = $codeGenerator->GetIDLType($interface, $idlType);
+            push(@$outputArray, "    auto $name = convertVariadicArguments<$metaType>(*state, $argumentIndex);\n");
+            push(@$outputArray, "    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
+
             $value = "WTFMove($name.arguments.value())";
 

trunk/Source/WebCore/bindings/scripts/IDLParser.pm

@@ -45 +45 @@
 });
 
+struct( domType => {
+    name =>         '$', # Type identifier
+    isNullable =>   '$', # Is the type Nullable (T?)
+    isUnion =>      '$', # Is the type a union (T or U)
+    subtypes =>     '@', # Array of subtypes, only valid if isUnion or sequence
+});
+
 # Used to represent 'interface' blocks
 struct( domInterface => {
@@ -80 +87 @@
 });
 
-struct( domType => {
-    name =>         '$', # Type identifier
-    isNullable =>   '$', # Is the type Nullable (T?)
-    isUnion =>      '$', # Is the type a union (T or U)
-    subtypes =>     '@', # Array of subtypes, only valid if isUnion or sequence
-});
-
 # Used to represent a map of 'variable name' <-> 'variable type'
 struct( domSignature => {
     direction => '$',   # Variable direction (in or out)
     name => '$',        # Variable name
-    type => '$'      ,  # Variable type
+    type => '$',        # Variable type name (DEPRECATED - please use idlType)
+    idlType => '$',     # Variable type
     specials => '@',    # Specials
     extendedAttributes => '$', # Extended attributes
@@ -708 +709 @@
 
         my $type = $self->parseType();
+        $member->idlType($type);
         $member->type($type->name);
         $member->isNullable($type->isNullable);
@@ -1255 +1257 @@
         
         my $type = $self->parseType();
+        $newDataNode->signature->idlType($type);
         $newDataNode->signature->type($type->name);
         $newDataNode->signature->isNullable($type->isNullable);
@@ -1547 +1550 @@
 
         my $type = $self->parseType();
+        $paramDataNode->idlType($type);
         $paramDataNode->type(identifierRemoveNullablePrefix($type->name));
         $paramDataNode->isNullable($type->isNullable);
@@ -1556 +1560 @@
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextExceptionField_1/) {
         my $type = $self->parseType();
+        $paramDataNode->idlType($type);
         $paramDataNode->type($type->name);
         $paramDataNode->isNullable($type->isNullable);
@@ -1618 +1623 @@
 
         my $type = $self->parseType();
+        $newDataNode->signature->idlType($type);
         $newDataNode->signature->type($type->name);
         $newDataNode->signature->isNullable($type->isNullable);

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -72 +72 @@
 #include <runtime/PropertyNameArray.h>
 #include <wtf/GetPtr.h>
+#include <wtf/Variant.h>
 
 #if ENABLE(Condition1)
@@ -985 +986 @@
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicDoubleMethod(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicNodeMethod(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicUnionMethod(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAny(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunction(JSC::ExecState*);
@@ -1592 +1594 @@
     { "variadicDoubleMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionVariadicDoubleMethod), (intptr_t) (1) } },
     { "variadicNodeMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionVariadicNodeMethod), (intptr_t) (1) } },
+    { "variadicUnionMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionVariadicUnionMethod), (intptr_t) (1) } },
     { "any", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionAny), (intptr_t) (2) } },
     { "testPromiseFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionTestPromiseFunction), (intptr_t) (0) } },
@@ -6564 +6567 @@
     ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
     auto& impl = castedThis->wrapped();
-    auto blobArgs = toArguments<VariadicHelper<JSBlob, Blob>>(*state, 0);
-    if (!blobArgs.arguments)
-        return throwArgumentTypeError(*state, throwScope, blobArgs.argumentIndex, "blobArgs", "TestObject", "overloadedMethod", "Blob");
+    auto blobArgs = convertVariadicArguments<IDLInterface<Blob>>(*state, 0);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     impl.overloadedMethod(WTFMove(blobArgs.arguments.value()));
     return JSValue::encode(jsUndefined());
@@ -7082 +7084 @@
     auto head = state->uncheckedArgument(0).toWTFString(state);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
-    auto tail = toArguments<VariadicHelper<JSC::JSValue, String>>(*state, 1);
+    auto tail = convertVariadicArguments<IDLDOMString>(*state, 1);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     impl.variadicStringMethod(WTFMove(head), WTFMove(tail.arguments.value()));
@@ -7103 +7105 @@
     auto head = convert<double>(*state, state->uncheckedArgument(0), ShouldAllowNonFinite::Yes);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
-    auto tail = toArguments<VariadicHelper<JSC::JSValue, double>>(*state, 1);
+    auto tail = convertVariadicArguments<IDLUnrestrictedDouble>(*state, 1);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     impl.variadicDoubleMethod(WTFMove(head), WTFMove(tail.arguments.value()));
@@ -7125 +7127 @@
     if (UNLIKELY(!head))
         return throwArgumentTypeError(*state, throwScope, 0, "head", "TestObject", "variadicNodeMethod", "Node");
-    auto tail = toArguments<VariadicHelper<JSNode, Node>>(*state, 1);
-    if (!tail.arguments)
-        return throwArgumentTypeError(*state, throwScope, tail.argumentIndex, "tail", "TestObject", "variadicNodeMethod", "Node");
+    auto tail = convertVariadicArguments<IDLInterface<Node>>(*state, 1);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     impl.variadicNodeMethod(*head, WTFMove(tail.arguments.value()));
+    return JSValue::encode(jsUndefined());
+}
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicUnionMethod(ExecState* state)
+{
+    VM& vm = state->vm();
+    auto throwScope = DECLARE_THROW_SCOPE(vm);
+    UNUSED_PARAM(throwScope);
+    JSValue thisValue = state->thisValue();
+    auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+    if (UNLIKELY(!castedThis))
+        return throwThisTypeError(*state, throwScope, "TestObject", "variadicUnionMethod");
+    ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
+    auto& impl = castedThis->wrapped();
+    if (UNLIKELY(state->argumentCount() < 1))
+        return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+    auto head = state->uncheckedArgument(0).toWTFString(state);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+    auto tail = convertVariadicArguments<IDLUnion<IDLInterface<Node>, IDLDOMString>>(*state, 1);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+    impl.variadicUnionMethod(WTFMove(head), WTFMove(tail.arguments.value()));
     return JSValue::encode(jsUndefined());
 }

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp

@@ -26 +26 @@
 #include "JSDOMBinding.h"
 #include "JSDOMConstructor.h"
+#include "JSDOMConvert.h"
 #include <runtime/Error.h>
 #include <runtime/FunctionPrototype.h>
@@ -138 +139 @@
     auto* castedThis = jsCast<JSTestOverloadedConstructorsConstructor*>(state->callee());
     ASSERT(castedThis);
-    auto longArgs = toArguments<VariadicHelper<JSC::JSValue, int32_t>>(*state, 0);
+    auto longArgs = convertVariadicArguments<IDLLong>(*state, 0);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     auto object = TestOverloadedConstructors::create(WTFMove(longArgs));

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -360 +360 @@
     void variadicDoubleMethod(unrestricted double head, unrestricted double... tail);
     void variadicNodeMethod(Node head, Node... tail);
+    void variadicUnionMethod(DOMString head, (Node or DOMString)... tail);
 
     // Nullable attributes.

trunk/Source/WebCore/dom/ChildNode.idl

@@ -23 +23 @@
     NoInterfaceObject,
 ] interface ChildNode {
-    [Unscopable, MayThrowLegacyException, Custom] void before((Node or DOMString)... nodes);
-    [Unscopable, MayThrowLegacyException, Custom] void after((Node or DOMString)... nodes);
-    [Unscopable, MayThrowLegacyException, Custom] void replaceWith((Node or DOMString)... nodes);
+    [Unscopable, MayThrowLegacyException] void before((Node or DOMString)... nodes);
+    [Unscopable, MayThrowLegacyException] void after((Node or DOMString)... nodes);
+    [Unscopable, MayThrowLegacyException] void replaceWith((Node or DOMString)... nodes);
     [Unscopable, MayThrowLegacyException] void remove();
 };

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -878 +878 @@
 }
 
-void ContainerNode::append(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+void ContainerNode::append(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     RefPtr<Node> node = convertNodesOrStringsIntoNode(WTFMove(nodeOrStringVector), ec);
@@ -887 +887 @@
 }
 
-void ContainerNode::prepend(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+void ContainerNode::prepend(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     RefPtr<Node> node = convertNodesOrStringsIntoNode(WTFMove(nodeOrStringVector), ec);

trunk/Source/WebCore/dom/ContainerNode.h

@@ -100 +100 @@
     WEBCORE_EXPORT Element* lastElementChild() const;
     WEBCORE_EXPORT unsigned childElementCount() const;
-    void append(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
-    void prepend(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
+    void append(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
+    void prepend(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
 
     bool ensurePreInsertionValidity(Node& newChild, Node* refChild, ExceptionCode&);

trunk/Source/WebCore/dom/Node.cpp

@@ -436 +436 @@
 }
 
-static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringVector(const Vector<std::experimental::variant<Ref<Node>, String>>& vector)
+static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringVector(const Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>& vector)
 {
     HashSet<RefPtr<Node>> nodeSet;
 
     auto visitor = WTF::makeVisitor(
-        [&](const Ref<Node>& node) { nodeSet.add(const_cast<Node*>(node.ptr())); },
+        [&](const std::reference_wrapper<Node>& node) { nodeSet.add(const_cast<Node*>(&node.get())); },
         [](const String&) { }
     );
@@ -469 +469 @@
 }
 
-RefPtr<Node> Node::convertNodesOrStringsIntoNode(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+RefPtr<Node> Node::convertNodesOrStringsIntoNode(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     if (nodeOrStringVector.isEmpty())
@@ -478 +478 @@
 
     auto visitor = WTF::makeVisitor(
-        [&](Ref<Node>& node) { nodes.uncheckedAppend(node.copyRef()); },
+        [&](std::reference_wrapper<Node>& node) { nodes.uncheckedAppend(node); },
         [&](String& string) { nodes.uncheckedAppend(Text::create(document(), string)); }
     );
@@ -496 +496 @@
 }
 
-void Node::before(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+void Node::before(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     RefPtr<ContainerNode> parent = parentNode();
@@ -517 +517 @@
 }
 
-void Node::after(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+void Node::after(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     RefPtr<ContainerNode> parent = parentNode();
@@ -533 +533 @@
 }
 
-void Node::replaceWith(Vector<std::experimental::variant<Ref<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
+void Node::replaceWith(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&& nodeOrStringVector, ExceptionCode& ec)
 {
     RefPtr<ContainerNode> parent = parentNode();

trunk/Source/WebCore/dom/Node.h

@@ -203 +203 @@
 
     // From the ChildNode - https://dom.spec.whatwg.org/#childnode
-    void before(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
-    void after(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
-    void replaceWith(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
+    void before(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
+    void after(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
+    void replaceWith(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
     WEBCORE_EXPORT void remove(ExceptionCode&);
 
@@ -660 +660 @@
     void updateAncestorsForStyleRecalc();
 
-    RefPtr<Node> convertNodesOrStringsIntoNode(Vector<std::experimental::variant<Ref<Node>, String>>&&, ExceptionCode&);
+    RefPtr<Node> convertNodesOrStringsIntoNode(Vector<std::experimental::variant<std::reference_wrapper<Node>, String>>&&, ExceptionCode&);
 
 private:

trunk/Source/WebCore/dom/ParentNode.idl

@@ -34 +34 @@
     readonly attribute unsigned long childElementCount;
 
-    [Unscopable, MayThrowLegacyException, Custom] void prepend((Node or DOMString)... nodes);
-    [Unscopable, MayThrowLegacyException, Custom] void append((Node or DOMString)... nodes);
+    [Unscopable, MayThrowLegacyException] void prepend((Node or DOMString)... nodes);
+    [Unscopable, MayThrowLegacyException] void append((Node or DOMString)... nodes);
 
     // [Unscopable] Element? query(DOMString relativeSelectors);