<!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>[204497] 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/204497">204497</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-15 23:24:39 -0700 (Mon, 15 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for dictionary members of non nullable wrapper types
https://bugs.webkit.org/show_bug.cgi?id=160876
Reviewed by Darin Adler.
Add support for dictionary members of non nullable wrapper types. We
only supported nullable wrapper types as dictionary members so far.
No new tests, updated bindings tests.
* bindings/js/JSDOMConvert.h:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDictionaryImplementationContent):
(GenerateParametersCheck):
(JSValueToNative):
(GenerateConstructorDefinition):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::construct):
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
(WebCore::JSTestNamedConstructorNamedConstructor::construct):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convertDictionary<TestObj::Dictionary>):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldTolerateNull>):
(WebCore::jsTestObjPrototypeFunctionAttachShadowRoot):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::constructJSTestOverloadedConstructors4):
(WebCore::constructJSTestOverloadedConstructors5):
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::JSTestTypedefsConstructor::construct):
* 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="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2016-08-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add support for dictionary members of non nullable wrapper types
+ https://bugs.webkit.org/show_bug.cgi?id=160876
+
+ Reviewed by Darin Adler.
+
+ Add support for dictionary members of non nullable wrapper types. We
+ only supported nullable wrapper types as dictionary members so far.
+
+ No new tests, updated bindings tests.
+
+ * bindings/js/JSDOMConvert.h:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDictionaryImplementationContent):
+ (GenerateParametersCheck):
+ (JSValueToNative):
+ (GenerateConstructorDefinition):
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::JSTestInterfaceConstructor::construct):
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ (WebCore::JSTestNamedConstructorNamedConstructor::construct):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convertDictionary<TestObj::Dictionary>):
+ (WebCore::convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>):
+ (WebCore::convertDictionary<TestObj::DictionaryThatShouldTolerateNull>):
+ (WebCore::jsTestObjPrototypeFunctionAttachShadowRoot):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ (WebCore::constructJSTestOverloadedConstructors4):
+ (WebCore::constructJSTestOverloadedConstructors5):
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::JSTestTypedefsConstructor::construct):
+ * bindings/scripts/test/TestObj.idl:
+
+2016-08-15 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop unused EventTarget::hasActiveEventListeners()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160869
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -49,6 +49,8 @@
</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>+template<typename T> Optional<T> convertDictionary(JSC::ExecState&, JSC::JSValue);
+
</ins><span class="cx"> enum class IsNullable { No, Yes };
</span><span class="cx"> template<typename T, typename JST> T* convertWrapperType(JSC::ExecState&, JSC::JSValue, IsNullable);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -980,14 +980,14 @@
</span><span class="cx"> $comma = ", ";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result .= "template<> $className convert<$className>(ExecState& state, JSValue value)\n";
</del><ins>+ $result .= "template<> Optional<$className> convertDictionary<$className>(ExecState& state, JSValue value)\n";
</ins><span class="cx"> $result .= "{\n";
</span><span class="cx"> $result .= " if (value.isUndefinedOrNull())\n" if $defaultValues;
</span><del>- $result .= " return { " . $defaultValues . " };\n" if $defaultValues;
</del><ins>+ $result .= " return $className { " . $defaultValues . " };\n" if $defaultValues;
</ins><span class="cx"> $result .= " auto* object = value.getObject();\n";
</span><span class="cx"> $result .= " if (UNLIKELY(!object || object->type() == RegExpObjectType)) {\n";
</span><span class="cx"> $result .= " throwTypeError(&state);\n";
</span><del>- $result .= " return { };\n";
</del><ins>+ $result .= " return Nullopt;\n";
</ins><span class="cx"> $result .= " }\n";
</span><span class="cx">
</span><span class="cx"> my $needExceptionCheck = 0;
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx"> foreach my $member (@{$dictionary->members}) {
</span><span class="cx"> if ($needExceptionCheck) {
</span><span class="cx"> $result .= " if (UNLIKELY(state.hadException()))\n";
</span><del>- $result .= " return { };\n";
</del><ins>+ $result .= " return Nullopt;\n";
</ins><span class="cx"> }
</span><span class="cx"> # FIXME: Eventually we will want this to share a lot more code with JSValueToNative.
</span><span class="cx"> my $type = $member->type;
</span><span class="lines">@@ -1001,9 +1001,10 @@
</span><span class="cx"> my $name = $member->name;
</span><span class="cx"> my $value = "object->get(&state, Identifier::fromString(&state, \"${name}\"))";
</span><span class="cx"> if ($codeGenerator->IsWrapperType($member->type)) {
</span><del>- die "Dictionary member of non-nullable wrapper types are not supported yet" unless $member->isNullable;
</del><span class="cx"> AddToImplIncludes("JS${type}.h");
</span><del>- $result .= " auto* $name = convertWrapperType<$type, JS${type}>(state, $value, IsNullable::Yes);\n";
</del><ins>+ die "Dictionary members of non-nullable wrapper types must be marked as required" if !$member->isNullable && $member->isOptional;
+ my $nullableParameter = $member->isNullable ? "IsNullable::Yes" : "IsNullable::No";
+ $result .= " auto* $name = convertWrapperType<$type, JS${type}>(state, $value, $nullableParameter);\n";
</ins><span class="cx"> } else {
</span><span class="cx"> my $function = $member->isOptional ? "convertOptional" : "convert";
</span><span class="cx"> $result .= " auto $name = ${function}<" . GetNativeTypeFromSignature($interface, $member) . ">(state, $value"
</span><span class="lines">@@ -1016,11 +1017,17 @@
</span><span class="cx"> my $arguments = "";
</span><span class="cx"> $comma = "";
</span><span class="cx"> foreach my $member (@{$dictionary->members}) {
</span><del>- $arguments .= $comma . "WTFMove(" . $member->name . ")";
</del><ins>+ my $value;
+ if ($codeGenerator->IsWrapperType($member->type) && !$member->isNullable) {
+ $value = "*" . $member->name;
+ } else {
+ $value = "WTFMove(" . $member->name . ")";
+ }
+ $arguments .= $comma . $value;
</ins><span class="cx"> $comma = ", ";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result .= " return { " . $arguments . " };\n";
</del><ins>+ $result .= " return $className { " . $arguments . " };\n";
</ins><span class="cx"> $result .= "}\n\n";
</span><span class="cx">
</span><span class="cx"> $result .= "#endif\n\n" if $conditionalString;
</span><span class="lines">@@ -4007,6 +4014,8 @@
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->IsTypedArrayType($type) and $parameter->type ne "ArrayBuffer") {
</span><span class="cx"> $value = $shouldPassByReference ? "$name.releaseNonNull()" : "WTFMove($name)";
</span><ins>+ } elsif ($codeGenerator->IsDictionaryType($type)) {
+ $value = "${name}.value()";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4678,7 +4687,7 @@
</span><span class="cx">
</span><span class="cx"> return ("to$type($value)", 1) if $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return ("parse<" . GetEnumerationClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsEnumType($type);
</span><del>- return ("convert<" . GetDictionaryClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsDictionaryType($type);
</del><ins>+ return ("convertDictionary<" . GetDictionaryClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsDictionaryType($type);
</ins><span class="cx">
</span><span class="cx"> AddToImplIncludes("JS$type.h", $conditional);
</span><span class="cx">
</span><span class="lines">@@ -5308,8 +5317,10 @@
</span><span class="cx"> last if $index eq $paramIndex;
</span><span class="cx"> if (ShouldPassWrapperByReference($parameter, $interface)) {
</span><span class="cx"> push(@constructorArgList, "*" . $parameter->name);
</span><ins>+ } elsif ($codeGenerator->IsDictionaryType($parameter->type)) {
+ push(@constructorArgList, $parameter->name . ".value()");
</ins><span class="cx"> } else {
</span><del>- push(@constructorArgList, $parameter->name);
</del><ins>+ push(@constructorArgList, "WTFMove(" . $parameter->name . ")");
</ins><span class="cx"> }
</span><span class="cx"> $index++;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> ScriptExecutionContext* context = castedThis->scriptExecutionContext();
</span><span class="cx"> if (UNLIKELY(!context))
</span><span class="cx"> return throwConstructorDocumentUnavailableError(*state, "TestInterface");
</span><del>- auto object = TestInterface::create(*context, str1, str2, ec);
</del><ins>+ auto object = TestInterface::create(*context, WTFMove(str1), WTFMove(str2), ec);
</ins><span class="cx"> if (UNLIKELY(ec)) {
</span><span class="cx"> setDOMException(state, ec);
</span><span class="cx"> return JSValue::encode(JSValue());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> auto str3 = state->argument(2).isUndefined() ? String() : state->uncheckedArgument(2).toWTFString(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto object = TestNamedConstructor::createForJSConstructor(*castedThis->document(), str1, str2, str3, ec);
</del><ins>+ auto object = TestNamedConstructor::createForJSConstructor(*castedThis->document(), WTFMove(str1), WTFMove(str2), WTFMove(str3), ec);
</ins><span class="cx"> if (UNLIKELY(ec)) {
</span><span class="cx"> setDOMException(state, ec);
</span><span class="cx"> return JSValue::encode(JSValue());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -452,137 +452,140 @@
</span><span class="cx"> return "\"high\", \"kinda-low\"";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::Dictionary convert<TestObj::Dictionary>(ExecState& state, JSValue value)
</del><ins>+template<> Optional<TestObj::Dictionary> convertDictionary<TestObj::Dictionary>(ExecState& state, JSValue value)
</ins><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, nullptr, jsUndefined(), jsUndefined() };
</del><ins>+ return TestObj::Dictionary { { }, TestObj::EnumType::EnumValue1, TestObj::EnumType::EmptyString, "defaultString", { }, false, { }, { }, { }, { }, 0, 0, { }, { }, 0, 0, { }, { }, { }, 0, { }, 0, { }, 0, { }, 0, { }, 0, nullptr, jsUndefined(), jsUndefined() };
</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><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx"> auto enumerationValueWithoutDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithoutDefault")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto enumerationValueWithDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithDefault")), TestObj::EnumType::EnumValue1);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto enumerationValueWithEmptyStringDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithEmptyStringDefault")), TestObj::EnumType::EmptyString);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto stringWithDefault = convertOptional<String>(state, object->get(&state, Identifier::fromString(&state, "stringWithDefault")), "defaultString");
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto stringWithoutDefault = convertOptional<String>(state, object->get(&state, Identifier::fromString(&state, "stringWithoutDefault")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto booleanWithDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithDefault")), false);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto sequenceOfStrings = convertOptional<Vector<String>>(state, object->get(&state, Identifier::fromString(&state, "sequenceOfStrings")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto restrictedDouble = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "restrictedDouble")), ShouldAllowNonFinite::No);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unrestrictedDouble = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedDouble")), ShouldAllowNonFinite::Yes);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto restrictedDoubleWithDefault = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "restrictedDoubleWithDefault")), ShouldAllowNonFinite::No, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unrestrictedDoubleWithDefault = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedDoubleWithDefault")), ShouldAllowNonFinite::Yes, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto restrictedFloat = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "restrictedFloat")), ShouldAllowNonFinite::No);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unrestrictedFloat = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedFloat")), ShouldAllowNonFinite::Yes);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto restrictedFloatWithDefault = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "restrictedFloatWithDefault")), ShouldAllowNonFinite::No, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unrestrictedFloatWithDefault = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedFloatWithDefault")), ShouldAllowNonFinite::Yes, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto smallIntegerClamped = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerClamped")), Clamp);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto smallIntegerWithDefault = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerWithDefault")), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto smallUnsignedIntegerEnforcedRange = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerEnforcedRange")), EnforceRange);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto smallUnsignedIntegerWithDefault = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerWithDefault")), NormalConversion, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto integer = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integer")), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto integerWithDefault = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integerWithDefault")), NormalConversion, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unsignedInteger = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedInteger")), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unsignedIntegerWithDefault = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedIntegerWithDefault")), NormalConversion, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto largeInteger = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeInteger")), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto largeIntegerWithDefault = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeIntegerWithDefault")), NormalConversion, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unsignedLargeInteger = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeInteger")), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto unsignedLargeIntegerWithDefault = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeIntegerWithDefault")), NormalConversion, 0);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto* nullableNode = convertWrapperType<Node, JSNode>(state, object->get(&state, Identifier::fromString(&state, "nullableNode")), IsNullable::Yes);
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto anyValue = convertOptional<JSC::JSValue>(state, object->get(&state, Identifier::fromString(&state, "anyValue")), jsUndefined());
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto anyTypedefValue = convertOptional<JSC::JSValue>(state, object->get(&state, Identifier::fromString(&state, "anyTypedefValue")), jsUndefined());
</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), WTFMove(nullableNode), WTFMove(any
Value), WTFMove(anyTypedefValue) };
</del><ins>+ return TestObj::Dictionary { 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(nullabl
eNode), WTFMove(anyValue), WTFMove(anyTypedefValue) };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::DictionaryThatShouldNotTolerateNull convert<TestObj::DictionaryThatShouldNotTolerateNull>(ExecState& state, JSValue value)
</del><ins>+template<> Optional<TestObj::DictionaryThatShouldNotTolerateNull> convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto* object = value.getObject();
</span><span class="cx"> if (UNLIKELY(!object || object->type() == RegExpObjectType)) {
</span><span class="cx"> throwTypeError(&state);
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx"> auto requiredEnumerationValue = convert<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "requiredEnumerationValue")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><del>- return { WTFMove(requiredEnumerationValue), WTFMove(booleanWithoutDefault) };
</del><ins>+ if (UNLIKELY(state.hadException()))
+ return Nullopt;
+ auto* nonNullableNode = convertWrapperType<Node, JSNode>(state, object->get(&state, Identifier::fromString(&state, "nonNullableNode")), IsNullable::No);
+ return TestObj::DictionaryThatShouldNotTolerateNull { WTFMove(requiredEnumerationValue), WTFMove(booleanWithoutDefault), *nonNullableNode };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::DictionaryThatShouldTolerateNull convert<TestObj::DictionaryThatShouldTolerateNull>(ExecState& state, JSValue value)
</del><ins>+template<> Optional<TestObj::DictionaryThatShouldTolerateNull> convertDictionary<TestObj::DictionaryThatShouldTolerateNull>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><del>- return { { }, { } };
</del><ins>+ return TestObj::DictionaryThatShouldTolerateNull { { }, { } };
</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><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> }
</span><span class="cx"> auto enumerationValue = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValue")));
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><del>- return { };
</del><ins>+ return Nullopt;
</ins><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><del>- return { WTFMove(enumerationValue), WTFMove(booleanWithoutDefault) };
</del><ins>+ return TestObj::DictionaryThatShouldTolerateNull { WTFMove(enumerationValue), WTFMove(booleanWithoutDefault) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Functions
</span><span class="lines">@@ -6392,10 +6395,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, createNotEnoughArgumentsError(state));
</span><del>- auto init = convert<TestObj::Dictionary>(*state, state->argument(0));
</del><ins>+ auto init = convertDictionary<TestObj::Dictionary>(*state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.attachShadowRoot(WTFMove(init));
</del><ins>+ impl.attachShadowRoot(init.value());
</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 (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> auto string = state->argument(0).toWTFString(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto object = TestOverloadedConstructors::create(string);
</del><ins>+ auto object = TestOverloadedConstructors::create(WTFMove(string));
</ins><span class="cx"> return JSValue::encode(asObject(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object))));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> Vector<int32_t> longArgs = toNativeArguments<int32_t>(*state, 0);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto object = TestOverloadedConstructors::create(longArgs);
</del><ins>+ auto object = TestOverloadedConstructors::create(WTFMove(longArgs));
</ins><span class="cx"> return JSValue::encode(asObject(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object))));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (UNLIKELY(!state->argument(1).isObject()))
</span><span class="cx"> return throwArgumentMustBeFunctionError(*state, 1, "testCallback", "TestTypedefs", nullptr);
</span><span class="cx"> auto testCallback = JSTestCallback::create(asObject(state->uncheckedArgument(1)), castedThis->globalObject());
</span><del>- auto object = TestTypedefs::create(hello, *testCallback);
</del><ins>+ auto object = TestTypedefs::create(WTFMove(hello), *testCallback);
</ins><span class="cx"> return JSValue::encode(asObject(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object))));
</span><span class="cx"> }
</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 (204496 => 204497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-16 05:14:17 UTC (rev 204496)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-16 06:24:39 UTC (rev 204497)
</span><span class="lines">@@ -438,6 +438,7 @@
</span><span class="cx"> dictionary TestDictionaryThatShouldNotTolerateNull {
</span><span class="cx"> required TestEnumType requiredEnumerationValue;
</span><span class="cx"> boolean booleanWithoutDefault;
</span><ins>+ required Node nonNullableNode;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> dictionary TestDictionaryThatShouldTolerateNull {
</span></span></pre>
</div>
</div>
</body>
</html>