<!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>[200920] 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/200920">200920</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-14 10:56:01 -0700 (Sat, 14 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Add support for dictionary members of integer types
https://bugs.webkit.org/show_bug.cgi?id=157703
Reviewed by Darin Adler.
Add support for dictionary members of integer types, including support
for the [Clamp] and [EnforceRange] IDL extended attributes on such
members.
* bindings/js/JSDOMConvert.h:
(WebCore::convert):
(WebCore::convertOptional):
- Add the needed template specializations so we can use convertOptional()
with integral types.
- Use std::enable_if so the template specializations meants to be used
for floating point types or integral types can only be instantiated
for such types.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateConversionRuleWithLeadingComma):
(GetIntegerConversionConfiguration):
(JSValueToNative):
Generate the right IntegerConversionConfiguration parameter for convert()
and convertOptional() when converting dictionary members of integral
types
* bindings/scripts/IDLParser.pm:
(parseDictionaryMember):
Fix bug in the IDL parser where we weren't initializing the extended
attributes for dictionary members.
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/TestObj.idl:
Add bindings tests coverage.</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 (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/ChangeLog 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-05-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WebIDL] Add support for dictionary members of integer types
+ https://bugs.webkit.org/show_bug.cgi?id=157703
+
+ Reviewed by Darin Adler.
+
+ Add support for dictionary members of integer types, including support
+ for the [Clamp] and [EnforceRange] IDL extended attributes on such
+ members.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::convert):
+ (WebCore::convertOptional):
+ - Add the needed template specializations so we can use convertOptional()
+ with integral types.
+ - Use std::enable_if so the template specializations meants to be used
+ for floating point types or integral types can only be instantiated
+ for such types.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateConversionRuleWithLeadingComma):
+ (GetIntegerConversionConfiguration):
+ (JSValueToNative):
+ Generate the right IntegerConversionConfiguration parameter for convert()
+ and convertOptional() when converting dictionary members of integral
+ types
+
+ * bindings/scripts/IDLParser.pm:
+ (parseDictionaryMember):
+ Fix bug in the IDL parser where we weren't initializing the extended
+ attributes for dictionary members.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/TestObj.idl:
+ Add bindings tests coverage.
+
+2016-05-14 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Allocate MacGlyphToPathTranslator / CairoGlyphToPathTranslator on the stack
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157690
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -32,17 +32,22 @@
</span><span class="cx">
</span><span class="cx"> enum class ShouldAllowNonFinite { No, Yes };
</span><span class="cx">
</span><ins>+template<typename T, typename U = T> using EnableIfIntegralType = typename std::enable_if<std::is_integral<T>::value, U>::type;
+template<typename T, typename U = T> using EnableIfFloatingPointType = typename std::enable_if<std::is_floating_point<T>::value, U>::type;
+
</ins><span class="cx"> template<typename T, typename Enable = void> struct Converter;
</span><span class="cx">
</span><span class="cx"> template<typename T> T convert(JSC::ExecState&, JSC::JSValue);
</span><del>-template<typename T> T convert(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
-template<typename T> T convert(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
</del><ins>+template<typename T> EnableIfIntegralType<T> convert(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
+template<typename T> EnableIfFloatingPointType<T> convert(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
</ins><span class="cx">
</span><span class="cx"> template<typename T> typename Converter<T>::OptionalValue convertOptional(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<typename T, typename U> T convertOptional(JSC::ExecState&, JSC::JSValue, U&& defaultValue);
</span><span class="cx">
</span><del>-template<typename T> typename Converter<T>::OptionalValue convertOptional(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
-template<typename T, typename U> T convertOptional(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite, U&& defaultValue);
</del><ins>+template<typename T> EnableIfIntegralType<T, Optional<T>> convertOptional(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
+template<typename T> EnableIfFloatingPointType<T, Optional<T>> convertOptional(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
+template<typename T, typename U> EnableIfIntegralType<T> convertOptional(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration, U&& defaultValue);
+template<typename T, typename U> EnableIfFloatingPointType<T> convertOptional(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite, U&& defaultValue);
</ins><span class="cx">
</span><span class="cx"> // This is where the implementation of the things declared above begins:
</span><span class="cx">
</span><span class="lines">@@ -51,18 +56,17 @@
</span><span class="cx"> return Converter<T>::convert(state, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> T convert(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
</del><ins>+template<typename T> inline EnableIfIntegralType<T> convert(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
</ins><span class="cx"> {
</span><span class="cx"> return Converter<T>::convert(state, value, configuration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> inline T convert(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow)
</del><ins>+template<typename T> inline EnableIfFloatingPointType<T> convert(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow)
</ins><span class="cx"> {
</span><del>- static_assert(std::is_same<T, float>::value || std::is_same<T, double>::value, "ShouldAllowNonFinite can only be used with float or double");
</del><span class="cx"> return Converter<T>::convert(state, value, allow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> typename Converter<T>::OptionalValue inline convertOptional(JSC::ExecState& state, JSC::JSValue value)
</del><ins>+template<typename T> inline typename Converter<T>::OptionalValue convertOptional(JSC::ExecState& state, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> return value.isUndefined() ? typename Converter<T>::OptionalValue() : convert<T>(state, value);
</span><span class="cx"> }
</span><span class="lines">@@ -72,16 +76,26 @@
</span><span class="cx"> return value.isUndefined() ? std::forward<U>(defaultValue) : convert<T>(state, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> typename Converter<T>::OptionalValue inline convertOptional(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow)
</del><ins>+template<typename T> inline EnableIfFloatingPointType<T, Optional<T>> convertOptional(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow)
</ins><span class="cx"> {
</span><del>- return value.isUndefined() ? typename Converter<T>::OptionalValue() : convert<T>(state, value, allow);
</del><ins>+ return value.isUndefined() ? Optional<T>() : convert<T>(state, value, allow);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T, typename U> inline T convertOptional(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow, U&& defaultValue)
</del><ins>+template<typename T, typename U> inline EnableIfFloatingPointType<T> convertOptional(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow, U&& defaultValue)
</ins><span class="cx"> {
</span><span class="cx"> return value.isUndefined() ? std::forward<U>(defaultValue) : convert<T>(state, value, allow);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> inline EnableIfIntegralType<T, Optional<T>> convertOptional(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
+{
+ return value.isUndefined() ? Optional<T>() : convert<T>(state, value, configuration);
+}
+
+template<typename T, typename U> inline EnableIfIntegralType<T> convertOptional(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration, U&& defaultValue)
+{
+ return value.isUndefined() ? std::forward<U>(defaultValue) : convert<T>(state, value, configuration);
+}
+
</ins><span class="cx"> template<typename T> struct DefaultConverter {
</span><span class="cx"> using OptionalValue = Optional<T>;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> if ($codeGenerator->IsFloatingPointType($member->type)) {
</span><span class="cx"> return ", " . (ShouldAllowNonFiniteForFloatingPointType($member->type) ? "ShouldAllowNonFinite::Yes" : "ShouldAllowNonFinite::No");
</span><span class="cx"> }
</span><del>- # FIXME: Add support for integer types.
</del><ins>+ return ", " . GetIntegerConversionConfiguration($member) if $codeGenerator->IsIntegerType($member->type);
</ins><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4384,7 +4384,7 @@
</span><span class="cx"> return exists $nativeType{$type};
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetIntegerConversionType
</del><ins>+sub GetIntegerConversionConfiguration
</ins><span class="cx"> {
</span><span class="cx"> my $signature = shift;
</span><span class="cx">
</span><span class="lines">@@ -4402,7 +4402,7 @@
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->IsIntegerType($type)) {
</span><span class="cx"> my $nativeType = GetNativeType($interface, $type);
</span><del>- my $conversionType = GetIntegerConversionType($signature);
</del><ins>+ my $conversionType = GetIntegerConversionConfiguration($signature);
</ins><span class="cx"> AddToImplIncludes("JSDOMConvert.h");
</span><span class="cx"> return ("convert<$nativeType>(*state, $value, $conversionType)", 1);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLParserpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -681,6 +681,7 @@
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "required", __LINE__);
</span><span class="cx"> $member->isOptional(0);
</span><span class="cx"> }
</span><ins>+ $member->extendedAttributes($extendedAttributeList);
</ins><span class="cx"> $member->type($self->parseType());
</span><span class="cx"> my $nameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($nameToken, IdentifierToken);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -455,7 +455,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 };
</del><ins>+ return { { }, TestObj::EnumType::EnumValue1, TestObj::EnumType::EmptyString, "defaultString", { }, false, { }, { }, { }, { }, 0, 0, { }, { }, 0, 0, { }, { }, { }, 0, { }, 0, { }, 0, { }, 0, { }, 0 };
</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">@@ -507,7 +507,43 @@
</span><span class="cx"> if (UNLIKELY(state.hadException()))
</span><span class="cx"> return { };
</span><span class="cx"> auto unrestrictedFloatWithDefault = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedFloatWithDefault")), ShouldAllowNonFinite::Yes, 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) };
</del><ins>+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto smallIntegerClamped = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerClamped")), Clamp);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto smallIntegerWithDefault = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerWithDefault")), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto smallUnsignedIntegerEnforcedRange = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerEnforcedRange")), EnforceRange);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto smallUnsignedIntegerWithDefault = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerWithDefault")), NormalConversion, 0);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto integer = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integer")), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto integerWithDefault = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integerWithDefault")), NormalConversion, 0);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto unsignedInteger = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedInteger")), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto unsignedIntegerWithDefault = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedIntegerWithDefault")), NormalConversion, 0);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto largeInteger = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeInteger")), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto largeIntegerWithDefault = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeIntegerWithDefault")), NormalConversion, 0);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto unsignedLargeInteger = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeInteger")), NormalConversion);
+ if (UNLIKELY(state.hadException()))
+ return { };
+ auto unsignedLargeIntegerWithDefault = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeIntegerWithDefault")), NormalConversion, 0);
+ 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) };
</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 (200919 => 200920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-14 16:54:07 UTC (rev 200919)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-14 17:56:01 UTC (rev 200920)
</span><span class="lines">@@ -399,6 +399,18 @@
</span><span class="cx"> unrestricted float unrestrictedFloat;
</span><span class="cx"> float restrictedFloatWithDefault = 0;
</span><span class="cx"> unrestricted float unrestrictedFloatWithDefault = 0;
</span><ins>+ [Clamp] byte smallIntegerClamped;
+ byte smallIntegerWithDefault;
+ [EnforceRange] octet smallUnsignedIntegerEnforcedRange;
+ octet smallUnsignedIntegerWithDefault = 0;
+ long integer;
+ long integerWithDefault = 0;
+ unsigned long unsignedInteger;
+ unsigned long unsignedIntegerWithDefault = 0;
+ long long largeInteger;
+ long long largeIntegerWithDefault = 0;
+ unsigned long long unsignedLargeInteger;
+ unsigned long long unsignedLargeIntegerWithDefault = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> dictionary TestDictionaryThatShouldNotTolerateNull {
</span></span></pre>
</div>
</div>
</body>
</html>