<!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>[204143] 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/204143">204143</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-04 15:02:21 -0700 (Thu, 04 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for wrapper types in dictionaries
https://bugs.webkit.org/show_bug.cgi?id=160487
Reviewed by Sam Weinig.
Add support for nullable wrapper types in dictionaries.
A TypeError is thrown if the conversion fails.
No new tests, updated bindings tests.
* bindings/js/JSDOMConvert.h:
(WebCore::convertWrapperType):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDictionaryImplementationContent):
* bindings/scripts/IDLParser.pm:
(parseDictionaryMember):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convert<TestObj::Dictionary>):
* bindings/scripts/test/TestObj.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsIDLParserpm">trunk/Source/WebCore/bindings/scripts/IDLParser.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/ChangeLog 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-04 Chris Dumez <cdumez@apple.com>
+
+ Add support for wrapper types in dictionaries
+ https://bugs.webkit.org/show_bug.cgi?id=160487
+
+ Reviewed by Sam Weinig.
+
+ Add support for nullable wrapper types in dictionaries.
+ A TypeError is thrown if the conversion fails.
+
+ No new tests, updated bindings tests.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::convertWrapperType):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDictionaryImplementationContent):
+ * bindings/scripts/IDLParser.pm:
+ (parseDictionaryMember):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convert<TestObj::Dictionary>):
+ * bindings/scripts/test/TestObj.idl:
+
</ins><span class="cx"> 2016-08-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Mac][cmake] Fix the build after Objective-C bindings generator removal
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> template<typename T, typename U> EnableIfIntegralType<T> convertOptional(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration, U&& defaultValue);
</span><span class="cx"> template<typename T, typename U> EnableIfFloatingPointType<T> convertOptional(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite, U&& defaultValue);
</span><span class="cx">
</span><ins>+enum class IsNullable { No, Yes };
+template<typename T, typename JST> T* convertWrapperType(JSC::ExecState&, JSC::JSValue, IsNullable);
+
</ins><span class="cx"> // This is where the implementation of the things declared above begins:
</span><span class="cx">
</span><span class="cx"> template<typename T> T convert(JSC::ExecState& state, JSC::JSValue value)
</span><span class="lines">@@ -66,6 +69,14 @@
</span><span class="cx"> return Converter<T>::convert(state, value, allow);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T, typename JST> inline T* convertWrapperType(JSC::ExecState& state, JSC::JSValue value, IsNullable isNullable)
+{
+ T* object = JST::toWrapped(value);
+ if (!object && (isNullable == IsNullable::No || !value.isUndefinedOrNull()))
+ throwTypeError(&state);
+ return object;
+}
+
</ins><span class="cx"> template<typename T> inline typename Converter<T>::OptionalValue convertOptional(JSC::ExecState& state, JSC::JSValue value)
</span><span class="cx"> {
</span><span class="cx"> return value.isUndefined() ? typename Converter<T>::OptionalValue() : convert<T>(state, value);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -923,6 +923,7 @@
</span><span class="cx"> my $enumerationValueName = GetEnumerationValueName(substr($value, 1, -1));
</span><span class="cx"> $value = $className . "::" . $enumerationValueName;
</span><span class="cx"> }
</span><ins>+ $value = "nullptr" if $value eq "null";
</ins><span class="cx">
</span><span class="cx"> return $value;
</span><span class="cx"> }
</span><span class="lines">@@ -998,11 +999,19 @@
</span><span class="cx"> $result .= " return { };\n";
</span><span class="cx"> }
</span><span class="cx"> # FIXME: Eventually we will want this to share a lot more code with JSValueToNative.
</span><del>- my $function = $member->isOptional ? "convertOptional" : "convert";
- $result .= " auto " . $member->name . " = " . $function . "<" . GetNativeTypeFromSignature($interface, $member) . ">"
- . "(state, object->get(&state, Identifier::fromString(&state, \"" . $member->name . "\"))"
- . GenerateConversionRuleWithLeadingComma($interface, $member)
- . GenerateDefaultValueWithLeadingComma($interface, $member) . ");\n";
</del><ins>+ my $type = $member->type;
+ my $name = $member->name;
+ my $value = "object->get(&state, Identifier::fromString(&state, \"${name}\"))";
+ if ($codeGenerator->IsWrapperType($member->type)) {
+ die "Dictionary member of non-nullable wrapper types are not supported yet" unless $member->isNullable;
+ AddToImplIncludes("JS${type}.h");
+ $result .= " auto* $name = convertWrapperType<$type, JS${type}>(state, $value, IsNullable::Yes);\n";
+ } else {
+ my $function = $member->isOptional ? "convertOptional" : "convert";
+ $result .= " auto $name = ${function}<" . GetNativeTypeFromSignature($interface, $member) . ">(state, $value"
+ . GenerateConversionRuleWithLeadingComma($interface, $member)
+ . GenerateDefaultValueWithLeadingComma($interface, $member) . ");\n";
+ }
</ins><span class="cx"> $needExceptionCheck = 1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLParserpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -683,7 +683,14 @@
</span><span class="cx"> $member->isOptional(0);
</span><span class="cx"> }
</span><span class="cx"> $member->extendedAttributes($extendedAttributeList);
</span><del>- $member->type($self->parseType());
</del><ins>+ my $type = $self->parseType();
+ if (typeHasNullableSuffix($type)) {
+ $member->isNullable(1);
+ } else {
+ $member->isNullable(0);
+ }
+ $member->type(typeRemoveNullableSuffix($type));
+
</ins><span class="cx"> my $nameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($nameToken, IdentifierToken);
</span><span class="cx"> $member->name($nameToken->value);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> template<> TestObj::Dictionary convert<TestObj::Dictionary>(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><del>- return { { }, TestObj::EnumType::EnumValue1, TestObj::EnumType::EmptyString, "defaultString", { }, false, { }, { }, { }, { }, 0, 0, { }, { }, 0, 0, { }, { }, { }, 0, { }, 0, { }, 0, { }, 0, { }, 0 };
</del><ins>+ return { { }, TestObj::EnumType::EnumValue1, TestObj::EnumType::EmptyString, "defaultString", { }, false, { }, { }, { }, { }, 0, 0, { }, { }, 0, 0, { }, { }, { }, 0, { }, 0, { }, 0, { }, 0, { }, 0, nullptr };
</ins><span class="cx"> auto* object = value.getObject();
</span><span class="cx"> if (UNLIKELY(!object || object->type() == RegExpObjectType)) {
</span><span class="cx"> throwTypeError(&state);
</span><span class="lines">@@ -542,7 +542,10 @@
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><span class="cx"> return { };
</span><span class="cx"> auto unsignedLargeIntegerWithDefault = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeIntegerWithDefault")), NormalConversion, 0);
</span><del>- return { WTFMove(enumerationValueWithoutDefault), WTFMove(enumerationValueWithDefault), WTFMove(enumerationValueWithEmptyStringDefault), WTFMove(stringWithDefault), WTFMove(stringWithoutDefault), WTFMove(booleanWithDefault), WTFMove(booleanWithoutDefault), WTFMove(sequenceOfStrings), WTFMove(restrictedDouble), WTFMove(unrestrictedDouble), WTFMove(restrictedDoubleWithDefault), WTFMove(unrestrictedDoubleWithDefault), WTFMove(restrictedFloat), WTFMove(unrestrictedFloat), WTFMove(restrictedFloatWithDefault), WTFMove(unrestrictedFloatWithDefault), WTFMove(smallIntegerClamped), WTFMove(smallIntegerWithDefault), WTFMove(smallUnsignedIntegerEnforcedRange), WTFMove(smallUnsignedIntegerWithDefault), WTFMove(integer), WTFMove(integerWithDefault), WTFMove(unsignedInteger), WTFMove(unsignedIntegerWithDefault), WTFMove(largeInteger), WTFMove(largeIntegerWithDefault), WTFMove(unsignedLargeInteger), WTFMove(unsignedLargeIntegerWithDefault) };
</del><ins>+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto* nullableNode = convertWrapperType<Node, JSNode>(state, object->get(&state, Identifier::fromString(&state, "nullableNode")), IsNullable::Yes);
+ return { WTFMove(enumerationValueWithoutDefault), WTFMove(enumerationValueWithDefault), WTFMove(enumerationValueWithEmptyStringDefault), WTFMove(stringWithDefault), WTFMove(stringWithoutDefault), WTFMove(booleanWithDefault), WTFMove(booleanWithoutDefault), WTFMove(sequenceOfStrings), WTFMove(restrictedDouble), WTFMove(unrestrictedDouble), WTFMove(restrictedDoubleWithDefault), WTFMove(unrestrictedDoubleWithDefault), WTFMove(restrictedFloat), WTFMove(unrestrictedFloat), WTFMove(restrictedFloatWithDefault), WTFMove(unrestrictedFloatWithDefault), WTFMove(smallIntegerClamped), WTFMove(smallIntegerWithDefault), WTFMove(smallUnsignedIntegerEnforcedRange), WTFMove(smallUnsignedIntegerWithDefault), WTFMove(integer), WTFMove(integerWithDefault), WTFMove(unsignedInteger), WTFMove(unsignedIntegerWithDefault), WTFMove(largeInteger), WTFMove(largeIntegerWithDefault), WTFMove(unsignedLargeInteger), WTFMove(unsignedLargeIntegerWithDefault), WTFMove(nullableNode) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> TestObj::DictionaryThatShouldNotTolerateNull convert<TestObj::DictionaryThatShouldNotTolerateNull>(ExecState& state, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (204142 => 204143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-04 21:45:52 UTC (rev 204142)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-04 22:02:21 UTC (rev 204143)
</span><span class="lines">@@ -403,6 +403,7 @@
</span><span class="cx"> long long largeIntegerWithDefault = 0;
</span><span class="cx"> unsigned long long unsignedLargeInteger;
</span><span class="cx"> unsigned long long unsignedLargeIntegerWithDefault = 0;
</span><ins>+ Node? nullableNode = null;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> dictionary TestDictionaryThatShouldNotTolerateNull {
</span></span></pre>
</div>
</div>
</body>
</html>