<!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>[209153] 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/209153">209153</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 14:10:49 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Add support for more missing / exotic IDLTypes
https://bugs.webkit.org/show_bug.cgi?id=165156
Reviewed by Alex Christensen.
- Adds JSDOMConvert support for WebIDL's 'callback interface' and 'callback function'.
- Adds JSDOMConvert support for WebIDL extensions for SerializedScriptValue, Dictionary,
EventListener and XPathNSResolver (moving much of their special casing out of perl and
into JSDOMConvert).
* DerivedSources.make:
Adds $(WebCore)/testing to the list of available IDL directories to keep internals
compiling.
* Modules/webaudio/WaveShaperNode.cpp:
* Modules/webaudio/WaveShaperNode.h:
Update to take curve by reference.
* bindings/generic/IDLTypes.h:
(WebCore::IDLWrapper):
Add helper type, IDLWrapper, which serves as a base type for all IDLTypes that are
RefCounted.
* bindings/js/JSDOMConvert.h:
(WebCore::convert):
(WebCore::Converter<IDLNullable<T>>::convert):
(WebCore::Converter<IDLCallbackFunction<T>>::convert):
(WebCore::JSConverter<IDLCallbackFunction<T>>::convert):
(WebCore::JSConverter<IDLCallbackFunction<T>>::convertNewlyCreated):
(WebCore::Converter<IDLCallbackInterface<T>>::convert):
(WebCore::JSConverter<IDLCallbackInterface<T>>::convert):
(WebCore::JSConverter<IDLCallbackInterface<T>>::convertNewlyCreated):
(WebCore::Converter<IDLSerializedScriptValue<T>>::convert):
(WebCore::JSConverter<IDLSerializedScriptValue<T>>::convert):
(WebCore::Converter<IDLLegacyDictionary<T>>::convert):
(WebCore::Converter<IDLEventListener<T>>::convert):
(WebCore::Converter<IDLXPathNSResolver<T>>::convert):
(WebCore::JSConverter<IDLXPathNSResolver<T>>::convert):
(WebCore::JSConverter<IDLXPathNSResolver<T>>::convertNewlyCreated):
Add converters for the new types. IDLSerializedScriptValue, IDLLegacyDictionary, IDLEventListener and IDLXPathNSResolver
have been templatized to avoid including their implementation classes everywhere. We can improve this in the future by
splitting JSDOMConvert up into to separate files.
* bindings/scripts/CodeGenerator.pm:
(IsBuiltinType):
(IsInterfaceType):
(IsWrapperType):
(ComputeIsCallbackInterface):
(ComputeIsCallbackFunction):
Add new predicates, IsBuiltinType and IsInterfaceType, and re-work IsWrapperType to determine all types that
have a JS wrapper (and consequently a JS{name}.h file).
* bindings/scripts/CodeGeneratorJS.pm:
(AddToIncludesForIDLType):
Update to add include for EventListener.
(GetArgumentExceptionFunction):
(GetArgumentExceptionThrower):
(GetAttributeExceptionFunction):
(GetAttributeExceptionThrower):
Add support for exceptions for callbacks.
(PassArgumentExpression):
Factor out logic on how to pass arguments to C++.
(GenerateHeader):
Make toWrapped and JSDOMWrapperConverterTraits work with XPathNSResolver.
(GenerateImplementation):
Update to use PassArgumentExpression and pass a global object reference to JSValueToNative.
(GenerateParametersCheck):
Remove special casing for callbacks.
(GenerateCallbackHeaderContent):
(GenerateCallbackImplementationContent):
Simplify toJS functions. State and global object are not necessary.
(GetBaseIDLType):
Add support for new types. Add assertion so that unknown types can't get through.
(ShouldPassArgumentByReference):
Rename from ShouldPassWrapperByReference, and merge in CodeGenerator's ShouldPassWrapperByReference.
(JSValueToNativeDOMConvertNeedsThisObject):
Added. Predicate to determine types that need a this object for conversion.
(JSValueToNativeDOMConvertNeedsGlobalObject):
Added. Predicate to determine types that need a global object for conversion.
(JSValueToNative):
Remove special cases for new types.
(NativeToJSValueDOMConvertNeedsState):
Add SerializedScriptValue and XPathNSResolver.
(NativeToJSValueDOMConvertNeedsGlobalObject):
Add SerializedScriptValue and XPathNSResolver.
(NativeToJSValueUsingReferences):
(NativeToJSValueUsingPointers):
(NativeToJSValue):
Remove unused $statePointer and replace $globalObject with $globalObjectReference. Remove
special cases for new types.
(GenerateConstructorDefinition):
Use PassArgumentExpression.
* bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
* bindings/scripts/test/JS/JSTestCallbackFunction.h:
* bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp:
* bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h:
* bindings/scripts/test/JS/JSTestCallbackInterface.cpp:
* bindings/scripts/test/JS/JSTestCallbackInterface.h:
* bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
* bindings/scripts/test/TestObj.idl:
* bindings/scripts/test/TestSerializedScriptValueInterface.idl:
Update tests. Remove test for a readonly attribute returning a Promise, which is not supported
yet (this was caught by the assertion added to GetBaseIDLType). Add tests for passing and returning
SerializedScriptValues from functions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioWaveShaperNodecpp">trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioWaveShaperNodeh">trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericIDLTypesh">trunk/Source/WebCore/bindings/generic/IDLTypes.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionWithTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionWithTypedefsh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackInterfaceh">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp</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>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestSerializedScriptValueInterfaceidl">trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -1,3 +1,130 @@
</span><ins>+2016-11-29 Sam Weinig <sam@webkit.org>
+
+ [WebIDL] Add support for more missing / exotic IDLTypes
+ https://bugs.webkit.org/show_bug.cgi?id=165156
+
+ Reviewed by Alex Christensen.
+
+ - Adds JSDOMConvert support for WebIDL's 'callback interface' and 'callback function'.
+ - Adds JSDOMConvert support for WebIDL extensions for SerializedScriptValue, Dictionary,
+ EventListener and XPathNSResolver (moving much of their special casing out of perl and
+ into JSDOMConvert).
+
+ * DerivedSources.make:
+ Adds $(WebCore)/testing to the list of available IDL directories to keep internals
+ compiling.
+
+ * Modules/webaudio/WaveShaperNode.cpp:
+ * Modules/webaudio/WaveShaperNode.h:
+ Update to take curve by reference.
+
+ * bindings/generic/IDLTypes.h:
+ (WebCore::IDLWrapper):
+ Add helper type, IDLWrapper, which serves as a base type for all IDLTypes that are
+ RefCounted.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::convert):
+ (WebCore::Converter<IDLNullable<T>>::convert):
+ (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+ (WebCore::JSConverter<IDLCallbackFunction<T>>::convert):
+ (WebCore::JSConverter<IDLCallbackFunction<T>>::convertNewlyCreated):
+ (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+ (WebCore::JSConverter<IDLCallbackInterface<T>>::convert):
+ (WebCore::JSConverter<IDLCallbackInterface<T>>::convertNewlyCreated):
+ (WebCore::Converter<IDLSerializedScriptValue<T>>::convert):
+ (WebCore::JSConverter<IDLSerializedScriptValue<T>>::convert):
+ (WebCore::Converter<IDLLegacyDictionary<T>>::convert):
+ (WebCore::Converter<IDLEventListener<T>>::convert):
+ (WebCore::Converter<IDLXPathNSResolver<T>>::convert):
+ (WebCore::JSConverter<IDLXPathNSResolver<T>>::convert):
+ (WebCore::JSConverter<IDLXPathNSResolver<T>>::convertNewlyCreated):
+ Add converters for the new types. IDLSerializedScriptValue, IDLLegacyDictionary, IDLEventListener and IDLXPathNSResolver
+ have been templatized to avoid including their implementation classes everywhere. We can improve this in the future by
+ splitting JSDOMConvert up into to separate files.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (IsBuiltinType):
+ (IsInterfaceType):
+ (IsWrapperType):
+ (ComputeIsCallbackInterface):
+ (ComputeIsCallbackFunction):
+ Add new predicates, IsBuiltinType and IsInterfaceType, and re-work IsWrapperType to determine all types that
+ have a JS wrapper (and consequently a JS{name}.h file).
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (AddToIncludesForIDLType):
+ Update to add include for EventListener.
+
+ (GetArgumentExceptionFunction):
+ (GetArgumentExceptionThrower):
+ (GetAttributeExceptionFunction):
+ (GetAttributeExceptionThrower):
+ Add support for exceptions for callbacks.
+
+ (PassArgumentExpression):
+ Factor out logic on how to pass arguments to C++.
+
+ (GenerateHeader):
+ Make toWrapped and JSDOMWrapperConverterTraits work with XPathNSResolver.
+
+ (GenerateImplementation):
+ Update to use PassArgumentExpression and pass a global object reference to JSValueToNative.
+
+ (GenerateParametersCheck):
+ Remove special casing for callbacks.
+
+ (GenerateCallbackHeaderContent):
+ (GenerateCallbackImplementationContent):
+ Simplify toJS functions. State and global object are not necessary.
+
+ (GetBaseIDLType):
+ Add support for new types. Add assertion so that unknown types can't get through.
+
+ (ShouldPassArgumentByReference):
+ Rename from ShouldPassWrapperByReference, and merge in CodeGenerator's ShouldPassWrapperByReference.
+
+ (JSValueToNativeDOMConvertNeedsThisObject):
+ Added. Predicate to determine types that need a this object for conversion.
+
+ (JSValueToNativeDOMConvertNeedsGlobalObject):
+ Added. Predicate to determine types that need a global object for conversion.
+
+ (JSValueToNative):
+ Remove special cases for new types.
+
+ (NativeToJSValueDOMConvertNeedsState):
+ Add SerializedScriptValue and XPathNSResolver.
+
+ (NativeToJSValueDOMConvertNeedsGlobalObject):
+ Add SerializedScriptValue and XPathNSResolver.
+
+ (NativeToJSValueUsingReferences):
+ (NativeToJSValueUsingPointers):
+ (NativeToJSValue):
+ Remove unused $statePointer and replace $globalObject with $globalObjectReference. Remove
+ special cases for new types.
+
+ (GenerateConstructorDefinition):
+ Use PassArgumentExpression.
+
+ * bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
+ * bindings/scripts/test/JS/JSTestCallbackFunction.h:
+ * bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp:
+ * bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h:
+ * bindings/scripts/test/JS/JSTestCallbackInterface.cpp:
+ * bindings/scripts/test/JS/JSTestCallbackInterface.h:
+ * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ * bindings/scripts/test/TestObj.idl:
+ * bindings/scripts/test/TestSerializedScriptValueInterface.idl:
+ Update tests. Remove test for a readonly attribute returning a Promise, which is not supported
+ yet (this was caught by the assertion added to GetBaseIDLType). Add tests for passing and returning
+ SerializedScriptValues from functions.
+
</ins><span class="cx"> 2016-11-30 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::verify to match the latest spec
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/DerivedSources.make 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -1290,6 +1290,7 @@
</span><span class="cx"> $(WebCore)/plugins \
</span><span class="cx"> $(WebCore)/storage \
</span><span class="cx"> $(WebCore)/svg \
</span><ins>+ $(WebCore)/testing \
</ins><span class="cx"> $(WebCore)/workers \
</span><span class="cx"> $(WebCore)/xml
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioWaveShaperNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx"> initialize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WaveShaperNode::setCurve(Float32Array* curve)
</del><ins>+void WaveShaperNode::setCurve(Float32Array& curve)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- waveShaperProcessor()->setCurve(curve);
</del><ins>+ waveShaperProcessor()->setCurve(&curve);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Float32Array* WaveShaperNode::curve()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioWaveShaperNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // setCurve() is called on the main thread.
</span><del>- void setCurve(Float32Array*);
</del><ins>+ void setCurve(Float32Array&);
</ins><span class="cx"> Float32Array* curve();
</span><span class="cx">
</span><span class="cx"> enum class OverSampleType { None, _2x, _4x };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericIDLTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/IDLTypes.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -38,6 +38,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Dictionary;
+class EventListener;
+class XPathNSResolver;
+
</ins><span class="cx"> template <typename Value> class DOMPromise;
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -92,18 +96,21 @@
</span><span class="cx">
</span><span class="cx"> struct IDLObject : IDLUnsupportedType { };
</span><span class="cx">
</span><del>-template<typename T> struct IDLInterface : IDLType<RefPtr<T>> {
</del><ins>+template<typename T> struct IDLWrapper : IDLType<RefPtr<T>> {
</ins><span class="cx"> using RawType = T;
</span><ins>+ using NullableType = RefPtr<T>;
</ins><span class="cx">
</span><del>- using NullableType = RefPtr<T>;
- static std::nullptr_t nullValue() { return nullptr; }
- static bool isNullValue(const RefPtr<T>& value) { return !value; }
- template <typename U> static U&& extractValueFromNullable(U&& value) { return std::forward<U>(value); }
</del><ins>+ static inline std::nullptr_t nullValue() { return nullptr; }
+ template<typename U> static inline bool isNullValue(U&& value) { return !value; }
+ template<typename U> static inline U&& extractValueFromNullable(U&& value) { return std::forward<U>(value); }
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename T> struct IDLInterface : IDLWrapper<T> { };
+template<typename T> struct IDLCallbackInterface : IDLWrapper<T> { };
+template<typename T> struct IDLCallbackFunction : IDLWrapper<T> { };
+
</ins><span class="cx"> template<typename T> struct IDLDictionary : IDLType<T> { };
</span><span class="cx"> template<typename T> struct IDLEnumeration : IDLType<T> { };
</span><del>-template<typename T> struct IDLCallbackFunction : IDLUnsupportedType { };
</del><span class="cx">
</span><span class="cx"> template<typename T> struct IDLNullable : IDLType<typename T::NullableType> {
</span><span class="cx"> using InnerType = T;
</span><span class="lines">@@ -143,8 +150,17 @@
</span><span class="cx"> static double extractValueFromNullable(double value) { return value; }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename T> struct IDLSerializedScriptValue : IDLWrapper<T> { };
+template<typename T> struct IDLLegacyDictionary : IDLType<T> { };
+template<typename T> struct IDLEventListener : IDLWrapper<T> { };
+template<typename T> struct IDLXPathNSResolver : IDLWrapper<T> { };
+
+
+// Non-WebIDL convenience type aliases
+
</ins><span class="cx"> using IDLBufferSource = IDLUnion<IDLInterface<JSC::ArrayBufferView>, IDLInterface<JSC::ArrayBuffer>>;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> // Helper predicates
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -45,9 +45,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue);
</span><ins>+template<typename T> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, JSC::JSObject&);
+template<typename T> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, JSDOMGlobalObject&);
</ins><span class="cx"> template<typename T> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
</span><span class="cx"> template<typename T> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, StringConversionConfiguration);
</span><span class="cx"> template<typename T, typename ExceptionThrower> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, ExceptionThrower&&);
</span><ins>+template<typename T, typename ExceptionThrower> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, JSC::JSObject&, ExceptionThrower&&);
+template<typename T, typename ExceptionThrower> typename Converter<T>::ReturnType convert(JSC::ExecState&, JSC::JSValue, JSDOMGlobalObject&, ExceptionThrower&&);
</ins><span class="cx">
</span><span class="cx"> // Specialized by generated code for IDL dictionary conversion.
</span><span class="cx"> template<typename T> T convertDictionary(JSC::ExecState&, JSC::JSValue);
</span><span class="lines">@@ -62,6 +66,16 @@
</span><span class="cx"> return Converter<T>::convert(state, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> inline typename Converter<T>::ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSC::JSObject& thisObject)
+{
+ return Converter<T>::convert(state, value, thisObject);
+}
+
+template<typename T> inline typename Converter<T>::ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject)
+{
+ return Converter<T>::convert(state, value, globalObject);
+}
+
</ins><span class="cx"> template<typename T> inline typename Converter<T>::ReturnType convert(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
</span><span class="cx"> {
</span><span class="cx"> return Converter<T>::convert(state, value, configuration);
</span><span class="lines">@@ -77,6 +91,16 @@
</span><span class="cx"> return Converter<T>::convert(state, value, std::forward<ExceptionThrower>(exceptionThrower));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T, typename ExceptionThrower> inline typename Converter<T>::ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSC::JSObject& thisObject, ExceptionThrower&& exceptionThrower)
+{
+ return Converter<T>::convert(state, value, thisObject, std::forward<ExceptionThrower>(exceptionThrower));
+}
+
+template<typename T, typename ExceptionThrower> inline typename Converter<T>::ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject, ExceptionThrower&& exceptionThrower)
+{
+ return Converter<T>::convert(state, value, globalObject, std::forward<ExceptionThrower>(exceptionThrower));
+}
+
</ins><span class="cx"> // Conversion from Implementation -> JSValue
</span><span class="cx"> template<typename T> struct JSConverter;
</span><span class="cx">
</span><span class="lines">@@ -221,6 +245,18 @@
</span><span class="cx"> return T::nullValue();
</span><span class="cx"> return Converter<T>::convert(state, value);
</span><span class="cx"> }
</span><ins>+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSC::JSObject& thisObject)
+ {
+ if (value.isUndefinedOrNull())
+ return T::nullValue();
+ return Converter<T>::convert(state, value, thisObject);
+ }
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject)
+ {
+ if (value.isUndefinedOrNull())
+ return T::nullValue();
+ return Converter<T>::convert(state, value, globalObject);
+ }
</ins><span class="cx"> static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
</span><span class="cx"> {
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="lines">@@ -233,7 +269,6 @@
</span><span class="cx"> return T::nullValue();
</span><span class="cx"> return Converter<T>::convert(state, value, configuration);
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> template<typename ExceptionThrower = DefaultExceptionThrower>
</span><span class="cx"> static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, ExceptionThrower&& exceptionThrower)
</span><span class="cx"> {
</span><span class="lines">@@ -241,6 +276,20 @@
</span><span class="cx"> return T::nullValue();
</span><span class="cx"> return Converter<T>::convert(state, value, std::forward<ExceptionThrower>(exceptionThrower));
</span><span class="cx"> }
</span><ins>+ template<typename ExceptionThrower = DefaultExceptionThrower>
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSC::JSObject& thisObject, ExceptionThrower&& exceptionThrower)
+ {
+ if (value.isUndefinedOrNull())
+ return T::nullValue();
+ return Converter<T>::convert(state, value, thisObject, std::forward<ExceptionThrower>(exceptionThrower));
+ }
+ template<typename ExceptionThrower = DefaultExceptionThrower>
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject, ExceptionThrower&& exceptionThrower)
+ {
+ if (value.isUndefinedOrNull())
+ return T::nullValue();
+ return Converter<T>::convert(state, value, globalObject, std::forward<ExceptionThrower>(exceptionThrower));
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct JSConverter<IDLNullable<T>> {
</span><span class="lines">@@ -1019,6 +1068,78 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // MARK: -
</span><ins>+// MARK: Callback function type
+
+template<typename T> struct Converter<IDLCallbackFunction<T>> : DefaultConverter<IDLCallbackFunction<T>> {
+ template<typename ExceptionThrower = DefaultExceptionThrower>
+ static RefPtr<T> convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject, ExceptionThrower&& exceptionThrower = ExceptionThrower())
+ {
+ JSC::VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ if (!value.isFunction()) {
+ exceptionThrower(state, scope);
+ return nullptr;
+ }
+
+ return T::create(JSC::asObject(value), &globalObject);
+ }
+};
+
+template<typename T> struct JSConverter<IDLCallbackFunction<T>> {
+ static constexpr bool needsState = false;
+ static constexpr bool needsGlobalObject = false;
+
+ template <typename U>
+ static JSC::JSValue convert(const U& value)
+ {
+ return toJS(Detail::getPtrOrRef(value));
+ }
+
+ template<typename U>
+ static JSC::JSValue convertNewlyCreated(U&& value)
+ {
+ return toJSNewlyCreated(std::forward<U>(value));
+ }
+};
+
+// MARK: -
+// MARK: Callback interface type
+
+template<typename T> struct Converter<IDLCallbackInterface<T>> : DefaultConverter<IDLCallbackInterface<T>> {
+ template<typename ExceptionThrower = DefaultExceptionThrower>
+ static RefPtr<T> convert(JSC::ExecState& state, JSC::JSValue value, JSDOMGlobalObject& globalObject, ExceptionThrower&& exceptionThrower = ExceptionThrower())
+ {
+ JSC::VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ if (!value.isObject()) {
+ exceptionThrower(state, scope);
+ return nullptr;
+ }
+
+ return T::create(JSC::asObject(value), &globalObject);
+ }
+};
+
+template<typename T> struct JSConverter<IDLCallbackInterface<T>> {
+ static constexpr bool needsState = false;
+ static constexpr bool needsGlobalObject = false;
+
+ template <typename U>
+ static JSC::JSValue convert(const U& value)
+ {
+ return toJS(Detail::getPtrOrRef(value));
+ }
+
+ template<typename U>
+ static JSC::JSValue convertNewlyCreated(U&& value)
+ {
+ return toJSNewlyCreated(std::forward<U>(value));
+ }
+};
+
+// MARK: -
</ins><span class="cx"> // MARK: Union type
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType, typename T, bool enabled>
</span><span class="lines">@@ -1292,6 +1413,92 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // MARK: -
</span><ins>+// MARK: SerializedScriptValue type
+
+template<typename T> struct Converter<IDLSerializedScriptValue<T>> : DefaultConverter<IDLSerializedScriptValue<T>> {
+ static RefPtr<T> convert(JSC::ExecState& state, JSC::JSValue value)
+ {
+ return T::create(state, value);
+ }
+};
+
+template<typename T> struct JSConverter<IDLSerializedScriptValue<T>> {
+ static constexpr bool needsState = true;
+ static constexpr bool needsGlobalObject = true;
+
+ static JSC::JSValue convert(JSC::ExecState& state, JSDOMGlobalObject& globalObject, RefPtr<T> value)
+ {
+ return value ? value->deserialize(state, &globalObject) : JSC::jsNull();
+ }
+};
+
+// MARK: -
+// MARK: Legacy dictionary type
+
+template<typename T> struct Converter<IDLLegacyDictionary<T>> : DefaultConverter<IDLLegacyDictionary<T>> {
+ using ReturnType = T;
+
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
+ {
+ return T(&state, value);
+ }
+};
+
+// MARK: -
+// MARK: Event Listener type
+
+template<typename T> struct Converter<IDLEventListener<T>> : DefaultConverter<IDLEventListener<T>> {
+ using ReturnType = RefPtr<T>;
+
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, JSC::JSObject& thisObject)
+ {
+ auto scope = DECLARE_THROW_SCOPE(state.vm());
+
+ auto listener = T::create(value, thisObject, false, currentWorld(&state));
+ if (!listener)
+ throwTypeError(&state, scope);
+
+ return listener;
+ }
+};
+
+// MARK: -
+// MARK: XPathNSResolver type
+
+template<typename T> struct Converter<IDLXPathNSResolver<T>> : DefaultConverter<IDLXPathNSResolver<T>> {
+ using ReturnType = RefPtr<T>;
+ using WrapperType = typename JSDOMWrapperConverterTraits<T>::WrapperClass;
+
+ template<typename ExceptionThrower = DefaultExceptionThrower>
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value, ExceptionThrower&& exceptionThrower = ExceptionThrower())
+ {
+ JSC::VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ ReturnType object = WrapperType::toWrapped(state, value);
+ if (UNLIKELY(!object))
+ exceptionThrower(state, scope);
+ return object;
+ }
+};
+
+template<typename T> struct JSConverter<IDLXPathNSResolver<T>> {
+ static constexpr bool needsState = true;
+ static constexpr bool needsGlobalObject = true;
+
+ template <typename U>
+ static JSC::JSValue convert(JSC::ExecState& state, JSDOMGlobalObject& globalObject, const U& value)
+ {
+ return toJS(&state, &globalObject, Detail::getPtrOrRef(value));
+ }
+
+ template<typename U>
+ static JSC::JSValue convertNewlyCreated(JSC::ExecState& state, JSDOMGlobalObject& globalObject, U&& value)
+ {
+ return toJSNewlyCreated(&state, &globalObject, std::forward<U>(value));
+ }
+};
+
+// MARK: -
</ins><span class="cx"> // MARK: Support for variadic tail convertions
</span><span class="cx">
</span><span class="cx"> namespace Detail {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -91,12 +91,6 @@
</span><span class="cx"> "Date" => 1
</span><span class="cx"> );
</span><span class="cx">
</span><del>-# WebCore types used directly in IDL files.
-my %webCoreTypeHash = (
- "Dictionary" => 1,
- "SerializedScriptValue" => 1,
-);
-
</del><span class="cx"> my %dictionaryTypeImplementationNameOverrides = ();
</span><span class="cx"> my %enumTypeImplementationNameOverrides = ();
</span><span class="cx">
</span><span class="lines">@@ -855,20 +849,54 @@
</span><span class="cx"> return ($functionName, $contentAttributeName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub IsWrapperType
</del><ins>+sub IsBuiltinType
</ins><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><span class="cx"> assert("Not a type") if ref($type) ne "IDLType";
</span><span class="cx">
</span><del>- return 0 if !$object->IsRefPtrType($type);
- return 0 if $object->IsTypedArrayType($type);
- return 0 if $type->name eq "BufferSource";
- return 0 if $webCoreTypeHash{$type->name};
</del><ins>+ return 1 if $object->IsPrimitiveType($type);
+ return 1 if $object->IsSequenceOrFrozenArrayType($type);
+ return 1 if $object->IsRecordType($type);
+ return 1 if $object->IsStringType($type);
+ return 1 if $object->IsTypedArrayType($type);
+ return 1 if $type->isUnion;
+ return 1 if $type->name eq "any";
+ return 1 if $type->name eq "BufferSource";
+ return 1 if $type->name eq "Promise";
+ return 1 if $type->name eq "XPathNSResolver";
+ return 1 if $type->name eq "EventListener";
+ return 1 if $type->name eq "Dictionary";
+ return 1 if $type->name eq "SerializedScriptValue";
</ins><span class="cx">
</span><ins>+ return 0;
+}
+
+sub IsInterfaceType
+{
+ my ($object, $type) = @_;
+
+ assert("Not a type") if ref($type) ne "IDLType";
+
+ return 0 if $object->IsBuiltinType($type);
+ return 0 if $object->IsDictionaryType($type);
+ return 0 if $object->IsEnumType($type);
+
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsWrapperType
+{
+ my ($object, $type) = @_;
+
+ assert("Not a type") if ref($type) ne "IDLType";
+
+ return 1 if $object->IsInterfaceType($type);
+ return 1 if $type->name eq "XPathNSResolver";
+
+ return 0;
+}
+
</ins><span class="cx"> sub GetInterfaceExtendedAttributesFromName
</span><span class="cx"> {
</span><span class="cx"> # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
</span><span class="lines">@@ -907,7 +935,7 @@
</span><span class="cx">
</span><span class="cx"> assert("Not a type") if ref($type) ne "IDLType";
</span><span class="cx">
</span><del>- return 0 unless $object->IsWrapperType($type);
</del><ins>+ return 0 unless $object->IsInterfaceType($type);
</ins><span class="cx">
</span><span class="cx"> my $typeName = $type->name;
</span><span class="cx"> my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
</span><span class="lines">@@ -944,7 +972,7 @@
</span><span class="cx">
</span><span class="cx"> assert("Not a type") if ref($type) ne "IDLType";
</span><span class="cx">
</span><del>- return 0 unless $object->IsWrapperType($type);
</del><ins>+ return 0 unless $object->IsInterfaceType($type);
</ins><span class="cx">
</span><span class="cx"> my $typeName = $type->name;
</span><span class="cx"> my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
</span><span class="lines">@@ -1092,14 +1120,5 @@
</span><span class="cx"> return $found;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub ShouldPassWrapperByReference
-{
- my ($object, $argument) = @_;
</del><span class="cx">
</span><del>- return 0 if $argument->type->isNullable;
- return 0 if !$object->IsWrapperType($argument->type) && !$object->IsTypedArrayType($argument->type);
-
- return 1;
-}
-
</del><span class="cx"> 1;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -278,7 +278,6 @@
</span><span class="cx"> return if $codeGenerator->IsPrimitiveType($type);
</span><span class="cx"> return if $codeGenerator->IsStringType($type);
</span><span class="cx"> return if $codeGenerator->IsTypedArrayType($type);
</span><del>- return if $type->name eq "BufferSource";
</del><span class="cx"> return if $type->name eq "any";
</span><span class="cx">
</span><span class="cx"> if ($type->isUnion) {
</span><span class="lines">@@ -304,7 +303,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsExternalDictionaryType($type) || $codeGenerator->IsExternalEnumType($type)) {
</del><ins>+ if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsExternalDictionaryType($type) || $codeGenerator->IsExternalEnumType($type) || $type->name eq "EventListener") {
</ins><span class="cx"> AddToIncludes("JS" . $type->name . ".h", $includesRef, $conditional);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -564,30 +563,73 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetArgumentExceptionThrower
</del><ins>+sub GetArgumentExceptionFunction
</ins><span class="cx"> {
</span><span class="cx"> my ($interface, $argument, $argumentIndex, $quotedFunctionName) = @_;
</span><span class="cx">
</span><del>- return undef if !$codeGenerator->IsWrapperType($argument->type) && !$codeGenerator->IsTypedArrayType($argument->type);
-
</del><span class="cx"> my $name = $argument->name;
</span><span class="cx"> my $visibleInterfaceName = $codeGenerator->GetVisibleInterfaceName($interface);
</span><span class="cx"> my $typeName = $argument->type->name;
</span><del>-
- return "[](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, ${argumentIndex}, \"${name}\", \"${visibleInterfaceName}\", ${quotedFunctionName}, \"${typeName}\"); }"
</del><ins>+
+ if ($codeGenerator->IsCallbackInterface($argument->type) || $codeGenerator->IsCallbackFunction($argument->type)) {
+ # FIXME: We should have specialized messages for callback interfaces vs. callback functions.
+ return "throwArgumentMustBeFunctionError(state, scope, ${argumentIndex}, \"${name}\", \"${visibleInterfaceName}\", ${quotedFunctionName});";
+ }
+
+ if ($codeGenerator->IsWrapperType($argument->type) || $codeGenerator->IsTypedArrayType($argument->type)) {
+ return "throwArgumentTypeError(state, scope, ${argumentIndex}, \"${name}\", \"${visibleInterfaceName}\", ${quotedFunctionName}, \"${typeName}\");";
+ }
+
+ return undef;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetAttributeExceptionThrower
</del><ins>+sub GetArgumentExceptionThrower
</ins><span class="cx"> {
</span><ins>+ my ($interface, $argument, $argumentIndex, $quotedFunctionName) = @_;
+
+ my $functionCall = GetArgumentExceptionFunction($interface, $argument, $argumentIndex, $quotedFunctionName);
+ return "[](JSC::ExecState& state, JSC::ThrowScope& scope) { " . $functionCall . " }" if $functionCall;
+}
+
+sub GetAttributeExceptionFunction
+{
</ins><span class="cx"> my ($interface, $attribute) = @_;
</span><del>-
- return undef if !$codeGenerator->IsWrapperType($attribute->type) && !$codeGenerator->IsTypedArrayType($attribute->type);
</del><span class="cx">
</span><span class="cx"> my $name = $attribute->name;
</span><span class="cx"> my $visibleInterfaceName = $codeGenerator->GetVisibleInterfaceName($interface);
</span><span class="cx"> my $typeName = $attribute->type->name;
</span><ins>+
+ if ($codeGenerator->IsWrapperType($attribute->type) || $codeGenerator->IsTypedArrayType($attribute->type)) {
+ return "throwAttributeTypeError(state, scope, \"${visibleInterfaceName}\", \"${name}\", \"${typeName}\");";
+ }
+}
+
+sub GetAttributeExceptionThrower
+{
+ my ($interface, $attribute) = @_;
+
+ my $functionCall = GetAttributeExceptionFunction($interface, $attribute);
+ return "[](JSC::ExecState& state, JSC::ThrowScope& scope) { " . $functionCall . " }" if $functionCall;
+
+}
+
+sub PassArgumentExpression
+{
+ my ($name, $context) = @_;
+
+ my $type = $context->type;
+
+ return "${name}.value()" if $codeGenerator->IsEnumType($type);
+ return "WTFMove(${name})" if $type->isNullable;
</ins><span class="cx">
</span><del>- return "[](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, \"${visibleInterfaceName}\", \"${name}\", \"${typeName}\"); }"
</del><ins>+ if ($codeGenerator->IsTypedArrayType($type)) {
+ return "*${name}" if $type->name eq "ArrayBuffer";
+ return "${name}.releaseNonNull()";
+ }
+
+ return "${name}.releaseNonNull()" if $codeGenerator->IsCallbackInterface($type) || $codeGenerator->IsCallbackFunction($type);
+ return "*${name}" if $codeGenerator->IsWrapperType($type);
+ return "WTFMove(${name})";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetAttributeGetterName
</span><span class="lines">@@ -1429,13 +1471,15 @@
</span><span class="cx"> # JSValue to implementation type
</span><span class="cx"> if (ShouldGenerateToWrapped($hasParent, $interface)) {
</span><span class="cx"> my $nativeType = GetNativeType($interface, $interface->type);
</span><del>- if ($interface->type->name eq "XPathNSResolver") {
- push(@headerContent, " static $nativeType toWrapped(JSC::ExecState&, JSC::JSValue);\n");
- } else {
- my $export = "";
- $export = "WEBCORE_EXPORT " if $interface->extendedAttributes->{ExportToWrappedFunction};
- push(@headerContent, " static $export$nativeType toWrapped(JSC::JSValue);\n");
- }
</del><ins>+
+ # FIXME: Add extended attribute for this.
+ my @toWrappedArguments = ();
+ push(@toWrappedArguments, "JSC::ExecState&") if $interface->type->name eq "XPathNSResolver";
+ push(@toWrappedArguments, "JSC::JSValue");
+
+ my $export = "";
+ $export = "WEBCORE_EXPORT " if $interface->extendedAttributes->{ExportToWrappedFunction};
+ push(@headerContent, " static $export$nativeType toWrapped(" . join(", ", @toWrappedArguments) . ");\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $headerTrailingIncludes{"${className}Custom.h"} = 1 if $interface->extendedAttributes->{JSCustomHeader};
</span><span class="lines">@@ -1816,7 +1860,7 @@
</span><span class="cx"> if (NeedsImplementationClass($interface)) {
</span><span class="cx"> push(@headerContent, "template<> struct JSDOMWrapperConverterTraits<${implType}> {\n");
</span><span class="cx"> push(@headerContent, " using WrapperClass = ${className};\n");
</span><del>- push(@headerContent, " using ToWrappedReturnType = ${implType}*;\n");
</del><ins>+ push(@headerContent, " using ToWrappedReturnType = " . GetNativeType($interface, $interface->type) . ";\n");
</ins><span class="cx"> push(@headerContent, "};\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3580,9 +3624,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ my $globalObjectReference = $attribute->isStatic ? "*jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())" : "*thisObject.globalObject()";
</ins><span class="cx"> my $exceptionThrower = GetAttributeExceptionThrower($interface, $attribute);
</span><span class="cx">
</span><del>- my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $attribute, "value", $attribute->extendedAttributes->{Conditional}, "&state", "state", "thisObject", $exceptionThrower);
</del><ins>+ my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $attribute, "value", $attribute->extendedAttributes->{Conditional}, "&state", "state", "thisObject", $globalObjectReference, $exceptionThrower);
</ins><span class="cx">
</span><span class="cx"> push(@implContent, " auto nativeValue = $nativeValue;\n");
</span><span class="cx"> push(@implContent, " RETURN_IF_EXCEPTION(throwScope, false);\n") if $mayThrowException;
</span><span class="lines">@@ -3594,13 +3639,8 @@
</span><span class="cx">
</span><span class="cx"> my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
</span><span class="cx">
</span><del>- if ($codeGenerator->IsTypedArrayType($type) and not $type->name eq "ArrayBuffer") {
- push(@arguments, "nativeValue.get()");
- } elsif ($codeGenerator->IsEnumType($type)) {
- push(@arguments, "nativeValue.value()");
- } else {
- push(@arguments, ShouldPassWrapperByReference($attribute, $interface) ? "*nativeValue" : "WTFMove(nativeValue)");
- }
</del><ins>+ push(@arguments, PassArgumentExpression("nativeValue", $attribute));
+
</ins><span class="cx"> my $implementedBy = $attribute->extendedAttributes->{ImplementedBy};
</span><span class="cx"> if ($implementedBy) {
</span><span class="cx"> AddToImplIncludes("${implementedBy}.h", $attribute->extendedAttributes->{Conditional});
</span><span class="lines">@@ -3840,7 +3880,7 @@
</span><span class="cx"> my $name = $argument->name;
</span><span class="cx"> my $encodedName = "encoded" . $codeGenerator->WK_ucfirst($name);
</span><span class="cx"> my $nativeType = GetNativeType($interface, $argument->type);
</span><del>- my $shouldPassByReference = ShouldPassWrapperByReference($argument, $interface);
</del><ins>+ my $shouldPassByReference = ShouldPassArgumentByReference($argument);
</ins><span class="cx">
</span><span class="cx"> if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
</span><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="lines">@@ -4308,9 +4348,10 @@
</span><span class="cx"> my $functionName;
</span><span class="cx"> my $implementedBy = $function->extendedAttributes->{ImplementedBy};
</span><span class="cx"> my $numArguments = @{$function->arguments};
</span><ins>+ my $conditional = $function->extendedAttributes->{Conditional};
</ins><span class="cx">
</span><span class="cx"> if ($implementedBy) {
</span><del>- AddToImplIncludes("${implementedBy}.h", $function->extendedAttributes->{Conditional});
</del><ins>+ AddToImplIncludes("${implementedBy}.h", $conditional);
</ins><span class="cx"> unshift(@arguments, "impl") if !$function->isStatic;
</span><span class="cx"> $functionName = "WebCore::${implementedBy}::${functionImplementationName}";
</span><span class="cx"> } elsif ($function->isStatic) {
</span><span class="lines">@@ -4328,7 +4369,7 @@
</span><span class="cx"> $quotedFunctionName = "nullptr";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $implIncludes{"JSDOMBinding.h"} = 1;
</del><ins>+ AddToImplIncludes("JSDOMBinding.h", $conditional);
</ins><span class="cx">
</span><span class="cx"> my $argumentIndex = 0;
</span><span class="cx"> foreach my $argument (@{$function->arguments}) {
</span><span class="lines">@@ -4358,57 +4399,21 @@
</span><span class="cx"> my $name = $argument->name;
</span><span class="cx"> my $value = $name;
</span><span class="cx">
</span><del>- if ($codeGenerator->IsCallbackInterface($type) || $codeGenerator->IsCallbackFunction($type)) {
- my $callbackClassName = GetCallbackClassName($type->name);
- my $typeName = $type->name;
- $implIncludes{"$callbackClassName.h"} = 1;
- if ($argument->isOptional) {
- push(@$outputArray, " RefPtr<$typeName> $name;\n");
- push(@$outputArray, " if (!state->argument($argumentIndex).isUndefinedOrNull()) {\n");
- if ($codeGenerator->IsCallbackFunction($type)) {
- push(@$outputArray, " if (!state->uncheckedArgument($argumentIndex).isFunction())\n");
- } else {
- push(@$outputArray, " if (!state->uncheckedArgument($argumentIndex).isObject())\n");
- }
- push(@$outputArray, " return throwArgumentMustBeFunctionError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName);\n");
- if ($function->isStatic) {
- AddToImplIncludes("CallbackFunction.h");
- push(@$outputArray, " $name = createFunctionOnlyCallback<${callbackClassName}>(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), state->uncheckedArgument($argumentIndex));\n");
- } else {
- push(@$outputArray, " $name = ${callbackClassName}::create(asObject(state->uncheckedArgument($argumentIndex)), castedThis->globalObject());\n");
- }
- push(@$outputArray, " }\n");
- } else {
- die "CallbackInterface does not support Variadic arguments" if $argument->isVariadic;
- if ($codeGenerator->IsCallbackFunction($type)) {
- push(@$outputArray, " if (UNLIKELY(!state->uncheckedArgument($argumentIndex).isFunction()))\n");
- } else {
- push(@$outputArray, " if (UNLIKELY(!state->uncheckedArgument($argumentIndex).isObject()))\n");
- }
- push(@$outputArray, " return throwArgumentMustBeFunctionError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName);\n");
- if ($function->isStatic) {
- AddToImplIncludes("CallbackFunction.h");
- push(@$outputArray, " auto $name = createFunctionOnlyCallback<${callbackClassName}>(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), state->uncheckedArgument($argumentIndex));\n");
- } else {
- push(@$outputArray, " auto $name = ${callbackClassName}::create(asObject(state->uncheckedArgument($argumentIndex)), castedThis->globalObject());\n");
- }
- }
- $value = "WTFMove($name)";
- } elsif ($argument->isVariadic) {
- $implIncludes{"JSDOMConvert.h"} = 1;
- AddToImplIncludesForIDLType($type, $function->extendedAttributes->{Conditional});
</del><ins>+ if ($argument->isVariadic) {
+ AddToImplIncludes("JSDOMConvert.h", $conditional);
+ AddToImplIncludesForIDLType($type, $conditional);
</ins><span class="cx">
</span><del>- my $metaType = GetIDLType($interface, $type);
- push(@$outputArray, " auto $name = convertVariadicArguments<$metaType>(*state, $argumentIndex);\n");
</del><ins>+ my $IDLType = GetIDLType($interface, $type);
+
+ push(@$outputArray, " auto ${name} = convertVariadicArguments<${IDLType}>(*state, ${argumentIndex});\n");
</ins><span class="cx"> push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
</span><span class="cx">
</span><del>- $value = "WTFMove($name.arguments.value())";
</del><ins>+ $value = "WTFMove(${name}.arguments.value())";
</ins><span class="cx">
</span><span class="cx"> } elsif ($codeGenerator->IsEnumType($type)) {
</span><ins>+ AddToImplIncludes("<runtime/Error.h>", $conditional);
+
</ins><span class="cx"> my $className = GetEnumerationClassName($type, $interface);
</span><del>-
- $implIncludes{"<runtime/Error.h>"} = 1;
-
</del><span class="cx"> my $nativeType = $className;
</span><span class="cx"> my $optionalValue = "optionalValue";
</span><span class="cx"> my $defineOptionalValue = "auto optionalValue";
</span><span class="lines">@@ -4476,46 +4481,20 @@
</span><span class="cx"> # Use std::optional<>() for optional arguments that are missing or undefined and that do not have a default value in the IDL.
</span><span class="cx"> $outer = "state->$argumentLookupMethod($argumentIndex).isUndefined() ? std::optional<$nativeType>() : ";
</span><span class="cx"> $inner = "state->uncheckedArgument($argumentIndex)";
</span><del>- } elsif (($argument->type->name eq "EventListener" || $argument->type->name eq "XPathNSResolver") && ($argument->isOptional || $type->isNullable)) {
- $outer = "";
- $inner = "state->uncheckedArgument($argumentIndex)";
</del><span class="cx"> } else {
</span><span class="cx"> $outer = "";
</span><span class="cx"> $inner = "state->$argumentLookupMethod($argumentIndex)";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ my $globalObjectReference = $function->isStatic ? "*jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())" : "*castedThis->globalObject()";
</ins><span class="cx"> my $argumentExceptionThrower = GetArgumentExceptionThrower($interface, $argument, $argumentIndex, $quotedFunctionName);
</span><del>- my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $argument, $inner, $function->extendedAttributes->{Conditional}, "state", "*state", "", $argumentExceptionThrower);
</del><span class="cx">
</span><del>- if ($argument->type->name eq "EventListener" || $argument->type->name eq "XPathNSResolver") {
- if ($argument->isOptional || $type->isNullable) {
- push(@$outputArray, " $nativeType $name = nullptr;\n");
- push(@$outputArray, " if (!state->$argumentLookupMethod($argumentIndex).isUndefinedOrNull()) {\n");
- push(@$outputArray, " $name = $nativeValue;\n");
- push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
- push(@$outputArray, " if (UNLIKELY(!$name))\n");
- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $type->name . "\");\n");
- push(@$outputArray, " }\n");
- } else {
- push(@$outputArray, " auto $name = $nativeValue;\n");
- push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
- push(@$outputArray, " if (UNLIKELY(!$name))\n");
- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $type->name . "\");\n");
- }
- } else {
- push(@$outputArray, " auto $name = ${outer}${nativeValue};\n");
- push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
- }
</del><ins>+ my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $argument, $inner, $conditional, "state", "*state", "*castedThis", $globalObjectReference, $argumentExceptionThrower);
</ins><span class="cx">
</span><del>- if (ShouldPassWrapperByReference($argument, $interface)) {
- if ($codeGenerator->IsTypedArrayType($type) and $type->name ne "ArrayBuffer") {
- $value = "$name.releaseNonNull()";
- } else {
- $value = "*$name";
- }
- } else {
- $value = "WTFMove($name)";
- }
</del><ins>+ push(@$outputArray, " auto $name = ${outer}${nativeValue};\n");
+ push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
+
+ $value = PassArgumentExpression($name, $argument);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@arguments, $value);
</span><span class="lines">@@ -4721,7 +4700,7 @@
</span><span class="cx"> push(@$contentRef, "\nprivate:\n");
</span><span class="cx">
</span><span class="cx"> # Constructor
</span><del>- push(@$contentRef, " $className(JSC::JSObject* callback, JSDOMGlobalObject*);\n\n");
</del><ins>+ push(@$contentRef, " ${className}(JSC::JSObject*, JSDOMGlobalObject*);\n\n");
</ins><span class="cx">
</span><span class="cx"> # Private members
</span><span class="cx"> push(@$contentRef, " ${callbackDataType}* m_data;\n");
</span><span class="lines">@@ -4728,8 +4707,8 @@
</span><span class="cx"> push(@$contentRef, "};\n\n");
</span><span class="cx">
</span><span class="cx"> # toJS().
</span><del>- push(@$contentRef, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ${name}&);\n");
- push(@$contentRef, "inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, ${name}* impl) { return impl ? toJS(state, globalObject, *impl) : JSC::jsNull(); }\n\n");
</del><ins>+ push(@$contentRef, "JSC::JSValue toJS(${name}&);\n");
+ push(@$contentRef, "inline JSC::JSValue toJS(${name}* impl) { return impl ? toJS(*impl) : JSC::jsNull(); }\n\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateCallbackImplementationContent
</span><span class="lines">@@ -4870,7 +4849,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # toJS() implementation.
</span><del>- push(@$contentRef, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ${name}& impl)\n");
</del><ins>+ push(@$contentRef, "JSC::JSValue toJS(${name}& impl)\n");
</ins><span class="cx"> push(@$contentRef, "{\n");
</span><span class="cx"> push(@$contentRef, " if (!static_cast<${className}&>(impl).callbackData())\n");
</span><span class="cx"> push(@$contentRef, " return jsNull();\n\n");
</span><span class="lines">@@ -5141,6 +5120,12 @@
</span><span class="cx">
</span><span class="cx"> # Non-WebIDL extensions
</span><span class="cx"> "Date" => "IDLDate",
</span><ins>+ "SerializedScriptValue" => "IDLSerializedScriptValue<SerializedScriptValue>",
+ "Dictionary" => "IDLLegacyDictionary<Dictionary>",
+ "EventListener" => "IDLEventListener<JSEventListener>",
+ "XPathNSResolver" => "IDLXPathNSResolver<XPathNSResolver>",
+
+ # Convenience type aliases
</ins><span class="cx"> "BufferSource" => "IDLBufferSource",
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -5151,6 +5136,10 @@
</span><span class="cx"> return "IDLFrozenArray<" . GetIDLType($interface, @{$type->subtypes}[0]) . ">" if $codeGenerator->IsFrozenArrayType($type);
</span><span class="cx"> return "IDLRecord<" . GetIDLType($interface, @{$type->subtypes}[0]) . ", " . GetIDLType($interface, @{$type->subtypes}[1]) . ">" if $codeGenerator->IsRecordType($type);
</span><span class="cx"> return "IDLUnion<" . join(", ", GetIDLUnionMemberTypes($interface, $type)) . ">" if $type->isUnion;
</span><ins>+ return "IDLCallbackFunction<" . GetCallbackClassName($type->name) . ">" if $codeGenerator->IsCallbackFunction($type);
+ return "IDLCallbackInterface<" . GetCallbackClassName($type->name) . ">" if $codeGenerator->IsCallbackInterface($type);
+
+ assert("Unknown type '" . $type->name . "'.\n") unless $codeGenerator->IsInterfaceType($type) || $codeGenerator->IsTypedArrayType($type);
</ins><span class="cx"> return "IDLInterface<" . $type->name . ">";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5213,14 +5202,18 @@
</span><span class="cx"> return GetNativeType($interface, $type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub ShouldPassWrapperByReference
</del><ins>+sub ShouldPassArgumentByReference
</ins><span class="cx"> {
</span><del>- my ($parameter, $interface) = @_;
</del><ins>+ my ($argument) = @_;
</ins><span class="cx">
</span><del>- return 0 if $codeGenerator->IsCallbackInterface($parameter->type) || $codeGenerator->IsCallbackFunction($parameter->type);
</del><ins>+ my $type = $argument->type;
</ins><span class="cx">
</span><del>- my $nativeType = GetNativeType($interface, $parameter->type);
- return $codeGenerator->ShouldPassWrapperByReference($parameter) && (substr($nativeType, -1) eq '*' || $nativeType =~ /^RefPtr/);
</del><ins>+ return 0 if $type->isNullable;
+ return 0 if $codeGenerator->IsCallbackInterface($type);
+ return 0 if $codeGenerator->IsCallbackFunction($type);
+ return 0 if !$codeGenerator->IsWrapperType($type) && !$codeGenerator->IsTypedArrayType($type);
+
+ return 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetIntegerConversionConfiguration
</span><span class="lines">@@ -5240,6 +5233,23 @@
</span><span class="cx"> return "StringConversionConfiguration::Normal";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub JSValueToNativeDOMConvertNeedsThisObject
+{
+ my $type = shift;
+
+ return 1 if $type->name eq "EventListener";
+ return 0;
+}
+
+sub JSValueToNativeDOMConvertNeedsGlobalObject
+{
+ my $type = shift;
+
+ return 1 if $codeGenerator->IsCallbackInterface($type);
+ return 1 if $codeGenerator->IsCallbackFunction($type);
+ return 0;
+}
+
</ins><span class="cx"> sub IsValidContextForJSValueToNative
</span><span class="cx"> {
</span><span class="cx"> my $context = shift;
</span><span class="lines">@@ -5251,7 +5261,7 @@
</span><span class="cx">
</span><span class="cx"> sub JSValueToNative
</span><span class="cx"> {
</span><del>- my ($interface, $context, $value, $conditional, $statePointer, $stateReference, $thisObjectReference, $exceptionThrower) = @_;
</del><ins>+ my ($interface, $context, $value, $conditional, $statePointer, $stateReference, $thisObjectReference, $globalObjectReference, $exceptionThrower) = @_;
</ins><span class="cx">
</span><span class="cx"> assert("Invalid context type") if !IsValidContextForJSValueToNative($context);
</span><span class="cx">
</span><span class="lines">@@ -5269,35 +5279,19 @@
</span><span class="cx"> return ("$value.toString($statePointer)->toAtomicString($statePointer)", 1) if $context->extendedAttributes->{AtomicString};
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type->name eq "SerializedScriptValue") {
- return ("SerializedScriptValue::create($stateReference, $value)", 1);
- }
-
- if ($type->name eq "Dictionary") {
- return ("Dictionary($statePointer, $value)", 0);
- }
-
</del><span class="cx"> if ($codeGenerator->IsEnumType($type)) {
</span><span class="cx"> return ("parseEnumeration<" . GetEnumerationClassName($type, $interface) . ">($stateReference, $value)", 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # FIXME: EventListener should be a callback interface.
- if ($type->name eq "EventListener") {
- return ("JSEventListener::create($value, $thisObjectReference, false, currentWorld($statePointer))", 0);
- }
-
- # FIXME: XPathNSResolver should be a callback interface.
- if ($type->name eq "XPathNSResolver") {
- return ("JSXPathNSResolver::toWrapped($stateReference, $value)", 1);
- }
-
</del><span class="cx"> AddToImplIncludes("JSDOMConvert.h");
</span><span class="cx">
</span><span class="cx"> my $IDLType = GetIDLType($interface, $type);
</span><span class="cx">
</span><span class="cx"> my @conversionArguments = ();
</span><del>- push(@conversionArguments, "$stateReference");
- push(@conversionArguments, "$value");
</del><ins>+ push(@conversionArguments, $stateReference);
+ push(@conversionArguments, $value);
+ push(@conversionArguments, $thisObjectReference) if JSValueToNativeDOMConvertNeedsThisObject($type);
+ push(@conversionArguments, $globalObjectReference) if JSValueToNativeDOMConvertNeedsGlobalObject($type);
</ins><span class="cx"> push(@conversionArguments, GetIntegerConversionConfiguration($context)) if $codeGenerator->IsIntegerType($type);
</span><span class="cx"> push(@conversionArguments, GetStringConversionConfiguration($context)) if $codeGenerator->IsStringType($type);
</span><span class="cx"> push(@conversionArguments, $exceptionThrower) if $exceptionThrower;
</span><span class="lines">@@ -5355,9 +5349,11 @@
</span><span class="cx"> return 1 if $codeGenerator->IsRecordType($type);
</span><span class="cx"> return 1 if $codeGenerator->IsStringType($type);
</span><span class="cx"> return 1 if $codeGenerator->IsEnumType($type);
</span><del>- return 1 if $codeGenerator->IsWrapperType($type);
</del><ins>+ return 1 if $codeGenerator->IsInterfaceType($type);
</ins><span class="cx"> return 1 if $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return 1 if $type->name eq "Date";
</span><ins>+ return 1 if $type->name eq "SerializedScriptValue";
+ return 1 if $type->name eq "XPathNSResolver";
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -5370,8 +5366,10 @@
</span><span class="cx"> return 1 if $type->isUnion;
</span><span class="cx"> return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($type);
</span><span class="cx"> return 1 if $codeGenerator->IsRecordType($type);
</span><del>- return 1 if $codeGenerator->IsWrapperType($type);
</del><ins>+ return 1 if $codeGenerator->IsInterfaceType($type);
</ins><span class="cx"> return 1 if $codeGenerator->IsTypedArrayType($type);
</span><ins>+ return 1 if $type->name eq "SerializedScriptValue";
+ return 1 if $type->name eq "XPathNSResolver";
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -5379,12 +5377,11 @@
</span><span class="cx"> sub NativeToJSValueUsingReferences
</span><span class="cx"> {
</span><span class="cx"> my ($context, $inFunctionCall, $interface, $value, $thisValue) = @_;
</span><del>- my $statePointer = "&state";
</del><span class="cx"> my $stateReference = "state";
</span><span class="cx"> my $wrapped = "$thisValue.wrapped()";
</span><del>- my $globalObject = $thisValue ? "$thisValue.globalObject()" : "jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject())";
</del><ins>+ my $globalObjectReference = $thisValue ? "*$thisValue.globalObject()" : "*jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject())";
</ins><span class="cx">
</span><del>- return NativeToJSValue($context, $inFunctionCall, $interface, $value, $statePointer, $stateReference, $wrapped, $globalObject);
</del><ins>+ return NativeToJSValue($context, $inFunctionCall, $interface, $value, $stateReference, $wrapped, $globalObjectReference);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: We should remove NativeToJSValueUsingPointers and combine NativeToJSValueUsingReferences and NativeToJSValue
</span><span class="lines">@@ -5391,12 +5388,11 @@
</span><span class="cx"> sub NativeToJSValueUsingPointers
</span><span class="cx"> {
</span><span class="cx"> my ($context, $inFunctionCall, $interface, $value, $thisValue) = @_;
</span><del>- my $statePointer = "state";
</del><span class="cx"> my $stateReference = "*state";
</span><span class="cx"> my $wrapped = "$thisValue->wrapped()";
</span><del>- my $globalObject = $thisValue ? "$thisValue->globalObject()" : "jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())";
</del><ins>+ my $globalObjectReference = $thisValue ? "*$thisValue->globalObject()" : "*jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())";
</ins><span class="cx">
</span><del>- return NativeToJSValue($context, $inFunctionCall, $interface, $value, $statePointer, $stateReference, $wrapped, $globalObject);
</del><ins>+ return NativeToJSValue($context, $inFunctionCall, $interface, $value, $stateReference, $wrapped, $globalObjectReference);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsValidContextForNativeToJSValue
</span><span class="lines">@@ -5408,7 +5404,7 @@
</span><span class="cx">
</span><span class="cx"> sub NativeToJSValue
</span><span class="cx"> {
</span><del>- my ($context, $inFunctionCall, $interface, $value, $statePointer, $stateReference, $wrapped, $globalObject) = @_;
</del><ins>+ my ($context, $inFunctionCall, $interface, $value, $stateReference, $wrapped, $globalObjectReference) = @_;
</ins><span class="cx">
</span><span class="cx"> assert("Invalid context type") if !IsValidContextForNativeToJSValue($context);
</span><span class="cx">
</span><span class="lines">@@ -5427,28 +5423,22 @@
</span><span class="cx"> my $returnType = $context->extendedAttributes->{ImplementationReturnType};
</span><span class="cx"> if (defined $returnType and ($returnType eq "IDBKeyPath" or $returnType eq "IDBKey")) {
</span><span class="cx"> AddToImplIncludes("IDBBindingUtilities.h", $conditional);
</span><del>- return "toJS($stateReference, *$globalObject, $value)";
</del><ins>+ return "toJS($stateReference, $globalObjectReference, $value)";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AddToImplIncludesForIDLType($type, $conditional);
</span><ins>+ AddToImplIncludes("JSDOMConvert.h", $conditional);
</ins><span class="cx">
</span><del>-
- if ($type->name eq "SerializedScriptValue") {
- return "$value ? $value->deserialize($stateReference, $globalObject) : jsNull()";
- }
-
</del><span class="cx"> $value = "BindingSecurity::checkSecurityForNode($stateReference, $value)" if $context->extendedAttributes->{CheckSecurityForNode};
</span><span class="cx">
</span><del>- AddToImplIncludes("JSDOMConvert.h");
-
</del><span class="cx"> my $IDLType = GetIDLType($interface, $type);
</span><span class="cx">
</span><span class="cx"> my @conversionArguments = ();
</span><del>- push(@conversionArguments, "$stateReference") if NativeToJSValueDOMConvertNeedsState($type) || $mayThrowException;
- push(@conversionArguments, "*$globalObject") if NativeToJSValueDOMConvertNeedsGlobalObject($type);
</del><ins>+ push(@conversionArguments, $stateReference) if NativeToJSValueDOMConvertNeedsState($type) || $mayThrowException;
+ push(@conversionArguments, $globalObjectReference) if NativeToJSValueDOMConvertNeedsGlobalObject($type);
</ins><span class="cx"> push(@conversionArguments, "throwScope") if $mayThrowException;
</span><del>- push(@conversionArguments, "$value");
</del><ins>+ push(@conversionArguments, $value);
</ins><span class="cx">
</span><span class="cx"> my $functionName = $context->extendedAttributes->{NewObject} ? "toJSNewlyCreated" : "toJS";
</span><span class="cx">
</span><span class="lines">@@ -5892,11 +5882,9 @@
</span><span class="cx"> my $index = 0;
</span><span class="cx"> foreach my $argument (@{$function->arguments}) {
</span><span class="cx"> last if $index eq $paramIndex;
</span><del>- if (ShouldPassWrapperByReference($argument, $interface)) {
- push(@constructorArgList, "*" . $argument->name);
- } else {
- push(@constructorArgList, "WTFMove(" . $argument->name . ")");
- }
</del><ins>+
+ push(@constructorArgList, PassArgumentExpression($argument->name, $argument));
+
</ins><span class="cx"> $index++;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> ExecState* state = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS<IDLInterface<Float32Array>>(*state, *m_data->globalObject(), arrayParam));
</span><del>- args.append(srzParam ? srzParam->deserialize(*state, m_data->globalObject()) : jsNull());
</del><ins>+ args.append(toJS<IDLSerializedScriptValue<SerializedScriptValue>>(*state, *m_data->globalObject(), srzParam));
</ins><span class="cx"> args.append(toJS<IDLDOMString>(*state, strArg));
</span><span class="cx"> args.append(toJS<IDLBoolean>(boolParam));
</span><span class="cx"> args.append(toJS<IDLLong>(longParam));
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> return !returnedException;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackFunction& impl)
</del><ins>+JSC::JSValue toJS(TestCallbackFunction& impl)
</ins><span class="cx"> {
</span><span class="cx"> if (!static_cast<JSTestCallbackFunction&>(impl).callbackData())
</span><span class="cx"> return jsNull();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx"> virtual bool handleEvent(RefPtr<Float32Array> arrayParam, RefPtr<SerializedScriptValue>&& srzParam, const String& strArg, bool boolParam, int32_t longParam, TestNode* testNodeParam);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSTestCallbackFunction(JSC::JSObject* callback, JSDOMGlobalObject*);
</del><ins>+ JSTestCallbackFunction(JSC::JSObject*, JSDOMGlobalObject*);
</ins><span class="cx">
</span><span class="cx"> JSCallbackDataStrong* m_data;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackFunction&);
-inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, TestCallbackFunction* impl) { return impl ? toJS(state, globalObject, *impl) : JSC::jsNull(); }
</del><ins>+JSC::JSValue toJS(TestCallbackFunction&);
+inline JSC::JSValue toJS(TestCallbackFunction* impl) { return impl ? toJS(*impl) : JSC::jsNull(); }
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionWithTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return !returnedException;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackFunctionWithTypedefs& impl)
</del><ins>+JSC::JSValue toJS(TestCallbackFunctionWithTypedefs& impl)
</ins><span class="cx"> {
</span><span class="cx"> if (!static_cast<JSTestCallbackFunctionWithTypedefs&>(impl).callbackData())
</span><span class="cx"> return jsNull();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctionWithTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunctionWithTypedefs.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> virtual bool handleEvent(Vector<int32_t> sequenceArg, int32_t longArg);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSTestCallbackFunctionWithTypedefs(JSC::JSObject* callback, JSDOMGlobalObject*);
</del><ins>+ JSTestCallbackFunctionWithTypedefs(JSC::JSObject*, JSDOMGlobalObject*);
</ins><span class="cx">
</span><span class="cx"> JSCallbackDataStrong* m_data;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackFunctionWithTypedefs&);
-inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, TestCallbackFunctionWithTypedefs* impl) { return impl ? toJS(state, globalObject, *impl) : JSC::jsNull(); }
</del><ins>+JSC::JSValue toJS(TestCallbackFunctionWithTypedefs&);
+inline JSC::JSValue toJS(TestCallbackFunctionWithTypedefs* impl) { return impl ? toJS(*impl) : JSC::jsNull(); }
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> ExecState* state = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><del>- args.append(srzParam ? srzParam->deserialize(*state, m_data->globalObject()) : jsNull());
</del><ins>+ args.append(toJS<IDLSerializedScriptValue<SerializedScriptValue>>(*state, *m_data->globalObject(), srzParam));
</ins><span class="cx"> args.append(toJS<IDLDOMString>(*state, strParam));
</span><span class="cx">
</span><span class="cx"> NakedPtr<JSC::Exception> returnedException;
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> return !returnedException;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackInterface& impl)
</del><ins>+JSC::JSValue toJS(TestCallbackInterface& impl)
</ins><span class="cx"> {
</span><span class="cx"> if (!static_cast<JSTestCallbackInterface&>(impl).callbackData())
</span><span class="cx"> return jsNull();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.h (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.h 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackInterface.h 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx"> virtual bool callbackRequiresThisToPass(int32_t longParam, TestNode* testNodeParam);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSTestCallbackInterface(JSC::JSObject* callback, JSDOMGlobalObject*);
</del><ins>+ JSTestCallbackInterface(JSC::JSObject*, JSDOMGlobalObject*);
</ins><span class="cx">
</span><span class="cx"> JSCallbackDataStrong* m_data;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCallbackInterface&);
-inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, TestCallbackInterface* impl) { return impl ? toJS(state, globalObject, *impl) : JSC::jsNull(); }
</del><ins>+JSC::JSValue toJS(TestCallbackInterface&);
+inline JSC::JSValue toJS(TestCallbackInterface* impl) { return impl ? toJS(*impl) : JSC::jsNull(); }
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><ins>+#include "JSDOMConvert.h"
</ins><span class="cx"> #include "JSMediaQueryListListener.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><span class="lines">@@ -177,10 +178,9 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isFunction()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "listener", "TestMediaQueryListListener", "method");
- auto listener = JSMediaQueryListListener::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- impl.method(WTFMove(listener));
</del><ins>+ auto listener = convert<IDLCallbackFunction<JSMediaQueryListListener>>(*state, state->uncheckedArgument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "listener", "TestMediaQueryListListener", "method"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.method(listener.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</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 (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSTestObj.h"
</span><span class="cx">
</span><del>-#include "CallbackFunction.h"
</del><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="lines">@@ -40,7 +39,6 @@
</span><span class="cx"> #include "JSEventListener.h"
</span><span class="cx"> #include "JSFetchRequest.h"
</span><span class="cx"> #include "JSNode.h"
</span><del>-#include "JSPromise.h"
</del><span class="cx"> #include "JSSVGDocument.h"
</span><span class="cx"> #include "JSSVGPoint.h"
</span><span class="cx"> #include "JSTestCallbackFunction.h"
</span><span class="lines">@@ -1272,7 +1270,6 @@
</span><span class="cx"> JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><del>-JSC::EncodedJSValue jsTestObjTestReadOnlyPromiseAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</del><span class="cx"> JSC::EncodedJSValue jsTestObjPutForwardsAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestObjPutForwardsAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx"> JSC::EncodedJSValue jsTestObjPutForwardsNullableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="lines">@@ -1419,18 +1416,16 @@
</span><span class="cx"> ASSERT(castedThis);
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "testCallback", "TestObject", nullptr);
- auto testCallback = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- if (UNLIKELY(!state->uncheckedArgument(1).isFunction()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 1, "testCallbackFunction", "TestObject", nullptr);
- auto testCallbackFunction = JSTestCallbackFunction::create(asObject(state->uncheckedArgument(1)), castedThis->globalObject());
</del><ins>+ auto testCallback = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "testCallback", "TestObject", nullptr); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto testCallbackFunction = convert<IDLCallbackFunction<JSTestCallbackFunction>>(*state, state->uncheckedArgument(1), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 1, "testCallbackFunction", "TestObject", nullptr); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> ScriptExecutionContext* context = castedThis->scriptExecutionContext();
</span><span class="cx"> if (UNLIKELY(!context))
</span><span class="cx"> return throwConstructorScriptExecutionContextUnavailableError(*state, throwScope, "TestObject");
</span><span class="cx"> ASSERT(context->isDocument());
</span><span class="cx"> auto& document = downcast<Document>(*context);
</span><del>- auto object = TestObj::create(document, WTFMove(testCallback), WTFMove(testCallbackFunction));
</del><ins>+ auto object = TestObj::create(document, testCallback.releaseNonNull(), testCallbackFunction.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1564,7 +1559,6 @@
</span><span class="cx"> { "nullableStringValue", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjNullableStringValue), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjNullableStringValue) } },
</span><span class="cx"> { "attribute", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><span class="cx"> { "attributeWithReservedEnumType", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttributeWithReservedEnumType), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjAttributeWithReservedEnumType) } },
</span><del>- { "testReadOnlyPromiseAttribute", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjTestReadOnlyPromiseAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</del><span class="cx"> { "putForwardsAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjPutForwardsAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjPutForwardsAttribute) } },
</span><span class="cx"> { "putForwardsNullableAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjPutForwardsNullableAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjPutForwardsNullableAttribute) } },
</span><span class="cx"> { "stringifierAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringifierAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStringifierAttribute) } },
</span><span class="lines">@@ -3335,22 +3329,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline JSValue jsTestObjTestReadOnlyPromiseAttributeGetter(ExecState&, JSTestObj&, ThrowScope& throwScope);
-
-EncodedJSValue jsTestObjTestReadOnlyPromiseAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
-{
- return BindingCaller<JSTestObj>::attribute<jsTestObjTestReadOnlyPromiseAttributeGetter, CastedThisErrorBehavior::RejectPromise>(state, thisValue, "testReadOnlyPromiseAttribute");
-}
-
-static inline JSValue jsTestObjTestReadOnlyPromiseAttributeGetter(ExecState& state, JSTestObj& thisObject, ThrowScope& throwScope)
-{
- UNUSED_PARAM(throwScope);
- UNUSED_PARAM(state);
- auto& impl = thisObject.wrapped();
- JSValue result = toJS<IDLInterface<Promise>>(state, *thisObject.globalObject(), impl.testReadOnlyPromiseAttribute());
- return result;
-}
-
</del><span class="cx"> static inline JSValue jsTestObjPutForwardsAttributeGetter(ExecState&, JSTestObj&, ThrowScope& throwScope);
</span><span class="cx">
</span><span class="cx"> EncodedJSValue jsTestObjPutForwardsAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="lines">@@ -4194,7 +4172,7 @@
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><span class="cx"> auto nativeValue = convert<IDLInterface<Float32Array>>(state, value, [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwAttributeTypeError(state, scope, "TestObject", "typedArrayAttr", "Float32Array"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, false);
</span><del>- impl.setTypedArrayAttr(nativeValue.get());
</del><ins>+ impl.setTypedArrayAttr(nativeValue.releaseNonNull());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5256,10 +5234,8 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- auto resolver = JSXPathNSResolver::toWrapped(*state, state->uncheckedArgument(0));
</del><ins>+ auto resolver = convert<IDLXPathNSResolver<XPathNSResolver>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "resolver", "TestObject", "methodWithXPathNSResolverParameter", "XPathNSResolver"); });
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- if (UNLIKELY(!resolver))
- return throwArgumentTypeError(*state, throwScope, 0, "resolver", "TestObject", "methodWithXPathNSResolverParameter", "XPathNSResolver");
</del><span class="cx"> impl.methodWithXPathNSResolverParameter(*resolver);
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -5562,7 +5538,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- auto serializedArg = SerializedScriptValue::create(*state, state->uncheckedArgument(0));
</del><ins>+ auto serializedArg = convert<IDLSerializedScriptValue<SerializedScriptValue>>(*state, state->uncheckedArgument(0));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> impl.serializedValue(WTFMove(serializedArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5582,8 +5558,10 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- auto oo = Dictionary(state, state->uncheckedArgument(0));
- auto ooo = Dictionary(state, state->argument(1));
</del><ins>+ auto oo = convert<IDLLegacyDictionary<Dictionary>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto ooo = convert<IDLLegacyDictionary<Dictionary>>(*state, state->argument(1));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> impl.optionsObject(WTFMove(oo), WTFMove(ooo));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -5736,12 +5714,11 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto type = convert<IDLDOMString>(*state, state->uncheckedArgument(0), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto listener = JSEventListener::create(state->uncheckedArgument(1), *castedThis, false, currentWorld(state));
- if (UNLIKELY(!listener))
- return throwArgumentTypeError(*state, throwScope, 1, "listener", "TestObject", "addEventListener", "EventListener");
</del><ins>+ auto listener = convert<IDLEventListener<JSEventListener>>(*state, state->uncheckedArgument(1), *castedThis);
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> auto useCapture = convert<IDLBoolean>(*state, state->argument(2));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- impl.addEventListener(WTFMove(type), *listener, WTFMove(useCapture));
</del><ins>+ impl.addEventListener(WTFMove(type), WTFMove(listener), WTFMove(useCapture));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5761,12 +5738,11 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto type = convert<IDLDOMString>(*state, state->uncheckedArgument(0), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto listener = JSEventListener::create(state->uncheckedArgument(1), *castedThis, false, currentWorld(state));
- if (UNLIKELY(!listener))
- return throwArgumentTypeError(*state, throwScope, 1, "listener", "TestObject", "removeEventListener", "EventListener");
</del><ins>+ auto listener = convert<IDLEventListener<JSEventListener>>(*state, state->uncheckedArgument(1), *castedThis);
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> auto useCapture = convert<IDLBoolean>(*state, state->argument(2));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- impl.removeEventListener(WTFMove(type), *listener, WTFMove(useCapture));
</del><ins>+ impl.removeEventListener(WTFMove(type), WTFMove(listener), WTFMove(useCapture));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6505,13 +6481,8 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- RefPtr<XPathNSResolver> resolver = nullptr;
- if (!state->argument(0).isUndefinedOrNull()) {
- resolver = JSXPathNSResolver::toWrapped(*state, state->uncheckedArgument(0));
- RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
- if (UNLIKELY(!resolver))
- return throwArgumentTypeError(*state, throwScope, 0, "resolver", "TestObject", "methodWithOptionalXPathNSResolver", "XPathNSResolver");
- }
</del><ins>+ auto resolver = convert<IDLNullable<IDLXPathNSResolver<XPathNSResolver>>>(*state, state->argument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "resolver", "TestObject", "methodWithOptionalXPathNSResolver", "XPathNSResolver"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> impl.methodWithOptionalXPathNSResolver(WTFMove(resolver));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -6548,10 +6519,9 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "methodWithCallbackArg");
- auto callback = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- impl.methodWithCallbackArg(WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "methodWithCallbackArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.methodWithCallbackArg(callback.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6571,10 +6541,9 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonCallback = convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- if (UNLIKELY(!state->uncheckedArgument(1).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackArg");
- auto callback = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(1)), castedThis->globalObject());
- impl.methodWithNonCallbackArgAndCallbackArg(WTFMove(nonCallback), WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(1), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.methodWithNonCallbackArgAndCallbackArg(WTFMove(nonCallback), callback.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6590,12 +6559,8 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- RefPtr<TestCallbackInterface> callback;
- if (!state->argument(0).isUndefinedOrNull()) {
- if (!state->uncheckedArgument(0).isObject())
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "methodWithCallbackAndOptionalArg");
- callback = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- }
</del><ins>+ auto callback = convert<IDLNullable<IDLCallbackInterface<JSTestCallbackInterface>>>(*state, state->argument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "methodWithCallbackAndOptionalArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> impl.methodWithCallbackAndOptionalArg(WTFMove(callback));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -6614,10 +6579,9 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isFunction()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "methodWithCallbackFunctionArg");
- auto callback = JSTestCallbackFunction::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- impl.methodWithCallbackFunctionArg(WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackFunction<JSTestCallbackFunction>>(*state, state->uncheckedArgument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "methodWithCallbackFunctionArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.methodWithCallbackFunctionArg(callback.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6637,10 +6601,9 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonCallback = convert<IDLLong>(*state, state->uncheckedArgument(0), IntegerConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- if (UNLIKELY(!state->uncheckedArgument(1).isFunction()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackFunctionArg");
- auto callback = JSTestCallbackFunction::create(asObject(state->uncheckedArgument(1)), castedThis->globalObject());
- impl.methodWithNonCallbackArgAndCallbackFunctionArg(WTFMove(nonCallback), WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackFunction<JSTestCallbackFunction>>(*state, state->uncheckedArgument(1), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackFunctionArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.methodWithNonCallbackArgAndCallbackFunctionArg(WTFMove(nonCallback), callback.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6656,12 +6619,8 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- RefPtr<TestCallbackFunction> callback;
- if (!state->argument(0).isUndefinedOrNull()) {
- if (!state->uncheckedArgument(0).isFunction())
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "methodWithCallbackFunctionAndOptionalArg");
- callback = JSTestCallbackFunction::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- }
</del><ins>+ auto callback = convert<IDLNullable<IDLCallbackFunction<JSTestCallbackFunction>>>(*state, state->argument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "methodWithCallbackFunctionAndOptionalArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> impl.methodWithCallbackFunctionAndOptionalArg(WTFMove(callback));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -6671,12 +6630,8 @@
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><del>- RefPtr<TestCallbackInterface> callback;
- if (!state->argument(0).isUndefinedOrNull()) {
- if (!state->uncheckedArgument(0).isObject())
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "staticMethodWithCallbackAndOptionalArg");
- callback = createFunctionOnlyCallback<JSTestCallbackInterface>(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), state->uncheckedArgument(0));
- }
</del><ins>+ auto callback = convert<IDLNullable<IDLCallbackInterface<JSTestCallbackInterface>>>(*state, state->argument(0), *jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "staticMethodWithCallbackAndOptionalArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</ins><span class="cx"> TestObj::staticMethodWithCallbackAndOptionalArg(WTFMove(callback));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -6688,10 +6643,9 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "staticMethodWithCallbackArg");
- auto callback = createFunctionOnlyCallback<JSTestCallbackInterface>(state, jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), state->uncheckedArgument(0));
- TestObj::staticMethodWithCallbackArg(WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(0), *jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject()), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "staticMethodWithCallbackArg"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ TestObj::staticMethodWithCallbackArg(callback.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6849,10 +6803,9 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- if (UNLIKELY(!state->uncheckedArgument(0).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 0, "callback", "TestObject", "overloadedMethod");
- auto callback = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(0)), castedThis->globalObject());
- impl.overloadedMethod(WTFMove(callback));
</del><ins>+ auto callback = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(0), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 0, "callback", "TestObject", "overloadedMethod"); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.overloadedMethod(callback.releaseNonNull());
</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 (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayBufferView = convert<IDLInterface<ArrayBufferView>>(*state, state->uncheckedArgument(0), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentTypeError(state, scope, 0, "arrayBufferView", "TestOverloadedConstructors", nullptr, "ArrayBufferView"); });
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- auto object = TestOverloadedConstructors::create(*arrayBufferView);
</del><ins>+ auto object = TestOverloadedConstructors::create(arrayBufferView.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "JSDOMConvert.h"
</span><span class="cx"> #include "JSMessagePort.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><ins>+#include <runtime/Error.h>
</ins><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><span class="cx"> #include <runtime/JSArray.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -37,6 +38,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// Functions
+
+JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionFunction(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturning(JSC::ExecState*);
+
</ins><span class="cx"> // Attributes
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="lines">@@ -101,6 +107,8 @@
</span><span class="cx"> { "cachedValue", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestSerializedScriptValueInterfaceCachedValue), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestSerializedScriptValueInterfaceCachedValue) } },
</span><span class="cx"> { "ports", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestSerializedScriptValueInterfacePorts), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><span class="cx"> { "cachedReadonlyValue", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestSerializedScriptValueInterfaceCachedReadonlyValue), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><ins>+ { "function", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionFunction), (intptr_t) (1) } },
+ { "functionReturning", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturning), (intptr_t) (0) } },
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSTestSerializedScriptValueInterfacePrototype::s_info = { "TestSerializedScriptValueInterfacePrototype", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfacePrototype) };
</span><span class="lines">@@ -146,6 +154,11 @@
</span><span class="cx"> return jsDynamicDowncast<JSTestSerializedScriptValueInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> inline JSTestSerializedScriptValueInterface* BindingCaller<JSTestSerializedScriptValueInterface>::castForOperation(ExecState& state)
+{
+ return jsDynamicDowncast<JSTestSerializedScriptValueInterface*>(state.thisValue());
+}
+
</ins><span class="cx"> static inline JSValue jsTestSerializedScriptValueInterfaceValueGetter(ExecState&, JSTestSerializedScriptValueInterface&, ThrowScope& throwScope);
</span><span class="cx">
</span><span class="cx"> EncodedJSValue jsTestSerializedScriptValueInterfaceValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
</span><span class="lines">@@ -158,7 +171,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = impl.value() ? impl.value()->deserialize(state, thisObject.globalObject()) : jsNull();
</del><ins>+ JSValue result = toJS<IDLSerializedScriptValue<SerializedScriptValue>>(state, *thisObject.globalObject(), impl.value());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,7 +187,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = impl.readonlyValue() ? impl.readonlyValue()->deserialize(state, thisObject.globalObject()) : jsNull();
</del><ins>+ JSValue result = toJS<IDLSerializedScriptValue<SerializedScriptValue>>(state, *thisObject.globalObject(), impl.readonlyValue());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -192,7 +205,7 @@
</span><span class="cx"> if (JSValue cachedValue = thisObject.m_cachedValue.get())
</span><span class="cx"> return cachedValue;
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = impl.cachedValue() ? impl.cachedValue()->deserialize(state, thisObject.globalObject()) : jsNull();
</del><ins>+ JSValue result = toJS<IDLSerializedScriptValue<SerializedScriptValue>>(state, *thisObject.globalObject(), impl.cachedValue());
</ins><span class="cx"> thisObject.m_cachedValue.set(state.vm(), &thisObject, result);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -227,7 +240,7 @@
</span><span class="cx"> if (JSValue cachedValue = thisObject.m_cachedReadonlyValue.get())
</span><span class="cx"> return cachedValue;
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = impl.cachedReadonlyValue() ? impl.cachedReadonlyValue()->deserialize(state, thisObject.globalObject()) : jsNull();
</del><ins>+ JSValue result = toJS<IDLSerializedScriptValue<SerializedScriptValue>>(state, *thisObject.globalObject(), impl.cachedReadonlyValue());
</ins><span class="cx"> thisObject.m_cachedReadonlyValue.set(state.vm(), &thisObject, result);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -268,7 +281,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- auto nativeValue = SerializedScriptValue::create(state, value);
</del><ins>+ auto nativeValue = convert<IDLSerializedScriptValue<SerializedScriptValue>>(state, value);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, false);
</span><span class="cx"> impl.setValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -287,7 +300,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- auto nativeValue = SerializedScriptValue::create(state, value);
</del><ins>+ auto nativeValue = convert<IDLSerializedScriptValue<SerializedScriptValue>>(state, value);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, false);
</span><span class="cx"> impl.setCachedValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -299,6 +312,41 @@
</span><span class="cx"> return getDOMConstructor<JSTestSerializedScriptValueInterfaceConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionCaller(JSC::ExecState*, JSTestSerializedScriptValueInterface*, JSC::ThrowScope&);
+
+EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionFunction(ExecState* state)
+{
+ return BindingCaller<JSTestSerializedScriptValueInterface>::callOperation<jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionCaller>(state, "function");
+}
+
+static inline JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionCaller(JSC::ExecState* state, JSTestSerializedScriptValueInterface* 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<IDLSerializedScriptValue<SerializedScriptValue>>(*state, state->uncheckedArgument(0));
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ impl.function(WTFMove(value));
+ return JSValue::encode(jsUndefined());
+}
+
+static inline JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturningCaller(JSC::ExecState*, JSTestSerializedScriptValueInterface*, JSC::ThrowScope&);
+
+EncodedJSValue JSC_HOST_CALL jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturning(ExecState* state)
+{
+ return BindingCaller<JSTestSerializedScriptValueInterface>::callOperation<jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturningCaller>(state, "functionReturning");
+}
+
+static inline JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePrototypeFunctionFunctionReturningCaller(JSC::ExecState* state, JSTestSerializedScriptValueInterface* castedThis, JSC::ThrowScope& throwScope)
+{
+ UNUSED_PARAM(state);
+ UNUSED_PARAM(throwScope);
+ auto& impl = castedThis->wrapped();
+ return JSValue::encode(toJS<IDLSerializedScriptValue<SerializedScriptValue>>(*state, *castedThis->globalObject(), impl.functionReturning()));
+}
+
</ins><span class="cx"> void JSTestSerializedScriptValueInterface::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> auto* thisObject = jsCast<JSTestSerializedScriptValueInterface*>(cell);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -134,13 +134,11 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto hello = convert<IDLDOMString>(*state, state->uncheckedArgument(0), StringConversionConfiguration::Normal);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- if (UNLIKELY(!state->uncheckedArgument(1).isFunction()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 1, "testCallbackFunction", "TestTypedefs", nullptr);
- auto testCallbackFunction = JSTestCallbackFunction::create(asObject(state->uncheckedArgument(1)), castedThis->globalObject());
- if (UNLIKELY(!state->uncheckedArgument(2).isObject()))
- return throwArgumentMustBeFunctionError(*state, throwScope, 2, "testCallbackInterface", "TestTypedefs", nullptr);
- auto testCallbackInterface = JSTestCallbackInterface::create(asObject(state->uncheckedArgument(2)), castedThis->globalObject());
- auto object = TestTypedefs::create(WTFMove(hello), WTFMove(testCallbackFunction), WTFMove(testCallbackInterface));
</del><ins>+ auto testCallbackFunction = convert<IDLCallbackFunction<JSTestCallbackFunction>>(*state, state->uncheckedArgument(1), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 1, "testCallbackFunction", "TestTypedefs", nullptr); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto testCallbackInterface = convert<IDLCallbackInterface<JSTestCallbackInterface>>(*state, state->uncheckedArgument(2), *castedThis->globalObject(), [](JSC::ExecState& state, JSC::ThrowScope& scope) { throwArgumentMustBeFunctionError(state, scope, 2, "testCallbackInterface", "TestTypedefs", nullptr); });
+ RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+ auto object = TestTypedefs::create(WTFMove(hello), testCallbackFunction.releaseNonNull(), testCallbackInterface.releaseNonNull());
</ins><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -263,7 +261,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = impl.immutableSerializedScriptValue() ? impl.immutableSerializedScriptValue()->deserialize(state, thisObject.globalObject()) : jsNull();
</del><ins>+ JSValue result = toJS<IDLSerializedScriptValue<SerializedScriptValue>>(state, *thisObject.globalObject(), impl.immutableSerializedScriptValue());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -400,7 +398,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- auto nativeValue = SerializedScriptValue::create(state, value);
</del><ins>+ auto nativeValue = convert<IDLSerializedScriptValue<SerializedScriptValue>>(state, value);
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, false);
</span><span class="cx"> impl.setImmutableSerializedScriptValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -548,7 +546,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><del>- auto sequenceArg = convert<IDLSequence<IDLInterface<SerializedScriptValue>>>(*state, state->uncheckedArgument(0));
</del><ins>+ auto sequenceArg = convert<IDLSequence<IDLSerializedScriptValue<SerializedScriptValue>>>(*state, state->uncheckedArgument(0));
</ins><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><span class="cx"> return JSValue::encode(toJS<IDLUnsignedLongLong>(impl.methodWithSequenceArg(WTFMove(sequenceArg))));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -391,8 +391,9 @@
</span><span class="cx"> attribute _optional attributeWithReservedEnumType;
</span><span class="cx"> void _any(unrestricted float a, long b);
</span><span class="cx">
</span><del>-
- readonly attribute Promise<void> testReadOnlyPromiseAttribute;
</del><ins>+ // FIXME: Add support for Promise attributes.
+ // readonly attribute Promise<void> testReadOnlyPromiseAttribute;
+
</ins><span class="cx"> // Promise function
</span><span class="cx"> Promise<void> testPromiseFunction();
</span><span class="cx"> Promise<void> testPromiseFunctionWithFloatArgument(float a);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestSerializedScriptValueInterfaceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl (209152 => 209153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl 2016-11-30 21:42:40 UTC (rev 209152)
+++ trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl 2016-11-30 22:10:49 UTC (rev 209153)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // This IDL file is for testing the bindings code generator and for tracking
</span><del>-// changes in its ouput.
</del><ins>+// changes in its output.
</ins><span class="cx"> [
</span><span class="cx"> Conditional=Condition1|Condition2,
</span><span class="cx"> ] interface TestSerializedScriptValueInterface {
</span><span class="lines">@@ -33,4 +33,6 @@
</span><span class="cx"> [CachedAttribute] attribute SerializedScriptValue cachedValue;
</span><span class="cx"> readonly attribute sequence<MessagePort> ports;
</span><span class="cx"> [CachedAttribute] readonly attribute SerializedScriptValue cachedReadonlyValue;
</span><ins>+ void function(SerializedScriptValue value);
+ SerializedScriptValue functionReturning();
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>