<!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>[200099] 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/200099">200099</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-26 11:22:40 -0700 (Tue, 26 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop Dictionary from CanUseWTFOptionalForParameter()
https://bugs.webkit.org/show_bug.cgi?id=157023
Reviewed by Darin Adler.
As per Web IDL, optional dictionary parameters are always considered to have
a default value of an empty dictionary, unless otherwise specified. There is
therefore never any need to use Optional<> for it. Just implement this
behavior in the bindings generator and drop blacklisting of Dictionary from
CanUseWTFOptionalForParameter().
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateParametersCheck):
(CanUseWTFOptionalForParameter): Deleted.
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionOptionsObject):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200098 => 200099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-26 18:20:09 UTC (rev 200098)
+++ trunk/Source/WebCore/ChangeLog 2016-04-26 18:22:40 UTC (rev 200099)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-04-26 Chris Dumez <cdumez@apple.com>
+
+ Drop Dictionary from CanUseWTFOptionalForParameter()
+ https://bugs.webkit.org/show_bug.cgi?id=157023
+
+ Reviewed by Darin Adler.
+
+ As per Web IDL, optional dictionary parameters are always considered to have
+ a default value of an empty dictionary, unless otherwise specified. There is
+ therefore never any need to use Optional<> for it. Just implement this
+ behavior in the bindings generator and drop blacklisting of Dictionary from
+ CanUseWTFOptionalForParameter().
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ (CanUseWTFOptionalForParameter): Deleted.
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionOptionsObject):
+
</ins><span class="cx"> 2016-04-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderElement::style() should return const RenderStyle
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200098 => 200099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-26 18:20:09 UTC (rev 200098)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-26 18:22:40 UTC (rev 200099)
</span><span class="lines">@@ -3383,13 +3383,48 @@
</span><span class="cx"> return 0 if $codeGenerator->IsEnumType($type);
</span><span class="cx"> return 0 if $codeGenerator->IsWrapperType($type);
</span><span class="cx"> return 0 if $type eq "DOMString";
</span><del>- return 0 if $type eq "Dictionary";
</del><span class="cx"> return 0 if $type eq "any";
</span><span class="cx"> return 0 if $type eq "unsigned long";
</span><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub WillConvertUndefinedToDefaultParameterValue
+{
+ my $parameterType = shift;
+ my $defaultValue = shift;
+
+ if ($defaultValue eq "[]") {
+ # Dictionary(state, undefined) will construct an empty Dictionary.
+ return 1 if $parameterType eq "Dictionary";
+
+ # toRefPtrNativeArray() will convert undefined to an empty Vector.
+ return 1 if $codeGenerator->GetArrayType($parameterType) or $codeGenerator->GetSequenceType($parameterType);
+ }
+
+ # toString() will convert undefined to the string "undefined";
+ return 1 if $parameterType eq "DOMString" and $defaultValue eq "undefined";
+
+ # JSValue::toBoolean() will convert undefined to false.
+ return 1 if $parameterType eq "boolean" and $defaultValue eq "false";
+
+ # JSValue::toInt*() / JSValue::toUint*() will convert undefined to 0.
+ if ($defaultValue eq "0") {
+ return 1 if $parameterType eq "byte" or $parameterType eq "octet";
+ return 1 if $parameterType eq "short" or $parameterType eq "unsigned short";
+ return 1 if $parameterType eq "long" or $parameterType eq "unsigned long";
+ return 1 if $parameterType eq "long long" or $parameterType eq "unsigned long long";
+ }
+
+ if ($defaultValue eq "NaN") {
+ # toNumber() / toFloat() convert undefined to NaN.
+ return 1 if $parameterType eq "double" or $parameterType eq "unrestricted double";
+ return 1 if $parameterType eq "float" or $parameterType eq "unrestricted float";
+ }
+
+ return 0;
+}
+
</ins><span class="cx"> sub GenerateParametersCheck
</span><span class="cx"> {
</span><span class="cx"> my $outputArray = shift;
</span><span class="lines">@@ -3434,12 +3469,13 @@
</span><span class="cx"> $implIncludes{"JSDOMBinding.h"} = 1;
</span><span class="cx"> foreach my $parameter (@{$function->parameters}) {
</span><span class="cx"> my $argType = $parameter->type;
</span><ins>+ my $optional = $parameter->isOptional;
</ins><span class="cx">
</span><del>- # Optional arguments with [Optional] should generate an early call with fewer arguments.
- # Optional arguments with [Optional=...] should not generate the early call.
- # Optional Dictionary arguments always considered to have default of empty dictionary.
- my $optional = $parameter->isOptional;
- if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter) && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($argType)) {
</del><ins>+ # As per Web IDL, optional dictionary parameters are always considered to have a default value of an empty dictionary, unless otherwise specified.
+ $parameter->default("[]") if ($optional && !defined($parameter->default) && $argType eq "Dictionary");
+
+ # FIXME: We should eventually stop generating any early calls, and instead use either default parameter values or WTF::Optional<>.
+ if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter) && !$codeGenerator->IsCallbackInterface($argType)) {
</ins><span class="cx"> # Generate early call if there are enough parameters.
</span><span class="cx"> if (!$hasOptionalArguments) {
</span><span class="cx"> push(@$outputArray, "\n size_t argsCount = state->argumentCount();\n");
</span><span class="lines">@@ -3598,7 +3634,7 @@
</span><span class="cx"> my $inner;
</span><span class="cx"> my $nativeType = GetNativeTypeFromSignature($parameter);
</span><span class="cx">
</span><del>- if ($optional && defined($parameter->default)) {
</del><ins>+ if ($optional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($parameter->type, $parameter->default)) {
</ins><span class="cx"> my $defaultValue = $parameter->default;
</span><span class="cx">
</span><span class="cx"> # String-related optimizations.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200098 => 200099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-26 18:20:09 UTC (rev 200098)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-26 18:22:40 UTC (rev 200099)
</span><span class="lines">@@ -4194,7 +4194,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalDoubleIsNaN");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- double number = state->argument(0).isUndefined() ? PNaN : state->uncheckedArgument(0).toNumber(state);
</del><ins>+ double number = state->argument(0).toNumber(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalDoubleIsNaN(number);
</span><span class="lines">@@ -4209,7 +4209,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalFloatIsNaN");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- float number = state->argument(0).isUndefined() ? PNaN : state->uncheckedArgument(0).toFloat(state);
</del><ins>+ float number = state->argument(0).toFloat(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalFloatIsNaN(number);
</span><span class="lines">@@ -4224,7 +4224,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalSequence");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- Vector<String> sequence = state->argument(0).isUndefined() ? Vector<String>() : toNativeArray<String>(state, state->uncheckedArgument(0));
</del><ins>+ Vector<String> sequence = toNativeArray<String>(state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalSequence(sequence);
</span><span class="lines">@@ -4254,7 +4254,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalLongLongIsZero");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- long long number = state->argument(0).isUndefined() ? 0 : toInt64(state, state->uncheckedArgument(0), NormalConversion);
</del><ins>+ long long number = toInt64(state, state->argument(0), NormalConversion);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalLongLongIsZero(number);
</span><span class="lines">@@ -4284,7 +4284,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalUnsignedLongLongIsZero");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- unsigned long long number = state->argument(0).isUndefined() ? 0 : toUInt64(state, state->uncheckedArgument(0), NormalConversion);
</del><ins>+ unsigned long long number = toUInt64(state, state->argument(0), NormalConversion);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalUnsignedLongLongIsZero(number);
</span><span class="lines">@@ -4314,7 +4314,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalArrayIsEmpty");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- Vector<String> array = state->argument(0).isUndefined() ? Vector<String>() : toNativeArray<String>(state, state->uncheckedArgument(0));
</del><ins>+ Vector<String> array = toNativeArray<String>(state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalArrayIsEmpty(array);
</span><span class="lines">@@ -4344,7 +4344,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalBooleanIsFalse");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- bool b = state->argument(0).isUndefined() ? false : state->uncheckedArgument(0).toBoolean(state);
</del><ins>+ bool b = state->argument(0).toBoolean(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalBooleanIsFalse(b);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (200098 => 200099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-26 18:20:09 UTC (rev 200098)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-26 18:22:40 UTC (rev 200099)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestTypedefs", "func");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- Vector<int> x = state->argument(0).isUndefined() ? Vector<int>() : toNativeArray<int>(state, state->uncheckedArgument(0));
</del><ins>+ Vector<int> x = toNativeArray<int>(state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.func(x);
</span></span></pre>
</div>
</div>
</body>
</html>