<!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>[207058] trunk</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/207058">207058</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 00:11:40 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
https://bugs.webkit.org/show_bug.cgi?id=163266
Reviewed by Darin Adler.
Source/WebCore:
Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
and use a regular constructor instead, as in the specification:
- http://w3c.github.io/IndexedDB/#request-idbversionchangeevent
This patch also fixes a bug where the IDBVersionChangeEvent was ignoring the
EventInit dictionary members passed by the JavaScript (e.g. bubbles).
No new tests, updated existing test.
* Modules/indexeddb/IDBVersionChangeEvent.cpp:
(WebCore::IDBVersionChangeEvent::IDBVersionChangeEvent):
* Modules/indexeddb/IDBVersionChangeEvent.h:
* Modules/indexeddb/IDBVersionChangeEvent.idl:
* bindings/js/JSDOMConvert.h:
(WebCore::convertNullable):
(WebCore::convert): Deleted.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDefaultValue):
(GenerateDictionaryImplementationContent):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convertDictionary<TestObj::Dictionary>):
* bindings/scripts/test/TestObj.idl:
LayoutTests:
Update existing layout test covering the IDBVersionChangeEvent constructor
to test to EventInit dictionary members as well.
* storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt:
* storage/indexeddb/modern/idbversionchangeevent-constructor.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbversionchangeeventconstructorexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbversionchangeeventconstructorhtml">trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventcpp">trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventh">trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventidl">trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl</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="#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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/LayoutTests/ChangeLog 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-11 Chris Dumez <cdumez@apple.com>
+
+ Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
+ https://bugs.webkit.org/show_bug.cgi?id=163266
+
+ Reviewed by Darin Adler.
+
+ Update existing layout test covering the IDBVersionChangeEvent constructor
+ to test to EventInit dictionary members as well.
+
+ * storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt:
+ * storage/indexeddb/modern/idbversionchangeevent-constructor.html:
+
</ins><span class="cx"> 2016-10-10 Adam Bergkvist <adam.bergkvist@ericsson.com> and Alejandro G. Castro <alex@igalia.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Make MediaEndpointPeerConnection handle remotely assigned mids correctly
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbversionchangeeventconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor-expected.txt 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -19,6 +19,11 @@
</span><span class="cx"> event = new IDBVersionChangeEvent('bar', { oldVersion: 43876528735628, newVersion: 0 });
</span><span class="cx"> PASS event.oldVersion is 43876528735628
</span><span class="cx"> PASS event.newVersion is 0
</span><ins>+event = new IDBVersionChangeEvent('bar', { bubbles: true, cancelable: true, composed: true });
+PASS event.type is "bar"
+PASS event.bubbles is true
+PASS event.cancelable is true
+PASS event.composed is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbversionchangeeventconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor.html (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor.html 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbversionchangeevent-constructor.html 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -35,6 +35,12 @@
</span><span class="cx"> shouldBeEqualToNumber("event.oldVersion", 43876528735628);
</span><span class="cx"> shouldBeEqualToNumber("event.newVersion", 0);
</span><span class="cx">
</span><ins>+evalAndLog("event = new IDBVersionChangeEvent('bar', { bubbles: true, cancelable: true, composed: true });");
+shouldBeEqualToString("event.type", "bar");
+shouldBeTrue("event.bubbles");
+shouldBeTrue("event.cancelable");
+shouldBeTrue("event.composed");
+
</ins><span class="cx"> finishJSTest();
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/ChangeLog 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-10-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
+ https://bugs.webkit.org/show_bug.cgi?id=163266
+
+ Reviewed by Darin Adler.
+
+ Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
+ and use a regular constructor instead, as in the specification:
+ - http://w3c.github.io/IndexedDB/#request-idbversionchangeevent
+
+ This patch also fixes a bug where the IDBVersionChangeEvent was ignoring the
+ EventInit dictionary members passed by the JavaScript (e.g. bubbles).
+
+ No new tests, updated existing test.
+
+ * Modules/indexeddb/IDBVersionChangeEvent.cpp:
+ (WebCore::IDBVersionChangeEvent::IDBVersionChangeEvent):
+ * Modules/indexeddb/IDBVersionChangeEvent.h:
+ * Modules/indexeddb/IDBVersionChangeEvent.idl:
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::convertNullable):
+ (WebCore::convert): Deleted.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDefaultValue):
+ (GenerateDictionaryImplementationContent):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convertDictionary<TestObj::Dictionary>):
+ * bindings/scripts/test/TestObj.idl:
+
+2016-10-11 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Update WebKitPlaybackTargetAvailabilityEvent to stop using legacy [ConstructorTemplate=Event]
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163265
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> m_newVersion = Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& name, const IDBVersionChangeEventInit& init)
- : Event(name, false /*canBubble*/, false /*cancelable*/)
</del><ins>+IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& name, const Init& init, IsTrusted isTrusted)
+ : Event(name, init, isTrusted)
</ins><span class="cx"> , m_oldVersion(init.oldVersion)
</span><span class="cx"> , m_newVersion(init.newVersion)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -33,11 +33,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct IDBVersionChangeEventInit : public EventInit {
- uint64_t oldVersion { 0 };
- Optional<uint64_t> newVersion;
-};
-
</del><span class="cx"> class IDBVersionChangeEvent final : public Event {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<IDBVersionChangeEvent> create(uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType)
</span><span class="lines">@@ -50,9 +45,14 @@
</span><span class="cx"> return adoptRef(*new IDBVersionChangeEvent(requestIdentifier, oldVersion, newVersion, eventType));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<IDBVersionChangeEvent> createForBindings(const AtomicString& type, const IDBVersionChangeEventInit& initializer)
</del><ins>+ struct Init : EventInit {
+ uint64_t oldVersion { 0 };
+ Optional<uint64_t> newVersion;
+ };
+
+ static Ref<IDBVersionChangeEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new IDBVersionChangeEvent(type, initializer));
</del><ins>+ return adoptRef(*new IDBVersionChangeEvent(type, initializer, isTrusted));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBResourceIdentifier& requestIdentifier() const { return m_requestIdentifier; }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType);
</span><del>- IDBVersionChangeEvent(const AtomicString&, const IDBVersionChangeEventInit&);
</del><ins>+ IDBVersionChangeEvent(const AtomicString&, const Init&, IsTrusted);
</ins><span class="cx">
</span><span class="cx"> EventInterface eventInterface() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBVersionChangeEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -23,11 +23,17 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// FIXME: This should be exposed to workers as well.
</ins><span class="cx"> [
</span><span class="cx"> Conditional=INDEXED_DATABASE,
</span><span class="cx"> EnabledAtRuntime=IndexedDB,
</span><del>- ConstructorTemplate=Event,
</del><ins>+ Constructor(DOMString type, optional IDBVersionChangeEventInit eventInitDict),
</ins><span class="cx"> ] interface IDBVersionChangeEvent : Event {
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute unsigned long long oldVersion;
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute unsigned long long? newVersion;
</span><span class="cx"> };
</span><ins>+
+dictionary IDBVersionChangeEventInit : EventInit {
+ unsigned long long oldVersion = 0;
+ unsigned long long? newVersion = null;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> T convert(JSC::ExecState&, JSC::JSValue);
</span><span class="cx"> template<typename T> EnableIfIntegralType<T> convert(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
</span><ins>+template<typename T> EnableIfIntegralType<Optional<T>> convertNullable(JSC::ExecState&, JSC::JSValue, IntegerConversionConfiguration);
</ins><span class="cx"> template<typename T> EnableIfFloatingPointType<T> convert(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
</span><span class="cx">
</span><span class="cx"> template<typename T> Optional<T> convertDictionary(JSC::ExecState&, JSC::JSValue);
</span><span class="lines">@@ -63,6 +64,11 @@
</span><span class="cx"> return Converter<T>::convert(state, value, configuration);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> inline EnableIfIntegralType<T, Optional<T>> convertNullable(JSC::ExecState& state, JSC::JSValue value, IntegerConversionConfiguration configuration)
+{
+ return value.isUndefinedOrNull() ? Optional<T>() : Converter<T>::convert(state, value, configuration);
+}
+
</ins><span class="cx"> template<typename T> inline EnableIfFloatingPointType<T> convert(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allow)
</span><span class="cx"> {
</span><span class="cx"> return Converter<T>::convert(state, value, allow);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -974,22 +974,25 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $member) = @_;
</span><span class="cx">
</span><del>- my $value = $member->default;
</del><ins>+ my $defaultValue = $member->default;
</ins><span class="cx">
</span><span class="cx"> if ($codeGenerator->IsEnumType($member->type)) {
</span><span class="cx"> # FIXME: Would be nice to report an error if the value does not have quote marks around it.
</span><span class="cx"> # FIXME: Would be nice to report an error if the value is not one of the enumeration values.
</span><span class="cx"> my $className = GetEnumerationClassName($member->type, $interface);
</span><del>- my $enumerationValueName = GetEnumerationValueName(substr($value, 1, -1));
- $value = $className . "::" . $enumerationValueName;
</del><ins>+ my $enumerationValueName = GetEnumerationValueName(substr($defaultValue, 1, -1));
+ return $className . "::" . $enumerationValueName;
</ins><span class="cx"> }
</span><del>- if ($value eq "null") {
- $value = $member->type eq "any" ? "jsNull()" : "nullptr";
</del><ins>+ if ($defaultValue eq "null") {
+ return "jsNull()" if $member->type eq "any";
+ return "nullptr" if $codeGenerator->IsWrapperType($member->type);
+ return "String()" if $codeGenerator->IsStringType($member->type);
+ return "Nullopt";
</ins><span class="cx"> }
</span><del>- $value = "{ }" if $value eq "[]";
- $value = "jsUndefined()" if $value eq "undefined";
</del><ins>+ return "{ }" if $defaultValue eq "[]";
+ return "jsUndefined()" if $defaultValue eq "undefined";
</ins><span class="cx">
</span><del>- return $value;
</del><ins>+ return $defaultValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub ShouldAllowNonFiniteForFloatingPointType
</span><span class="lines">@@ -1131,7 +1134,8 @@
</span><span class="cx"> $result .= " RETURN_IF_EXCEPTION(throwScope, Nullopt);\n";
</span><span class="cx"> } else {
</span><span class="cx"> my $conversionRuleWithLeadingComma = GenerateConversionRuleWithLeadingComma($interface, $member);
</span><del>- $result .= " result.$key = convert<${nativeType}>(state, ${key}Value${conversionRuleWithLeadingComma});\n";
</del><ins>+ my $convertFunction = $member->isNullable ? "convertNullable" : "convert";
+ $result .= " result.$key = $convertFunction<${nativeType}>(state, ${key}Value${conversionRuleWithLeadingComma});\n";
</ins><span class="cx"> $result .= " RETURN_IF_EXCEPTION(throwScope, Nullopt);\n";
</span><span class="cx"> }
</span><span class="cx"> # Value is undefined.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -550,6 +550,12 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, Nullopt);
</span><span class="cx"> } else
</span><span class="cx"> result.largeIntegerWithDefault = 0;
</span><ins>+ JSValue nullableIntegerWithDefaultValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "nullableIntegerWithDefault"));
+ if (!nullableIntegerWithDefaultValue.isUndefined()) {
+ result.nullableIntegerWithDefault = convertNullable<int32_t>(state, nullableIntegerWithDefaultValue, NormalConversion);
+ RETURN_IF_EXCEPTION(throwScope, Nullopt);
+ } else
+ result.nullableIntegerWithDefault = Nullopt;
</ins><span class="cx"> JSValue nullableNodeValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "nullableNode"));
</span><span class="cx"> if (!nullableNodeValue.isUndefined()) {
</span><span class="cx"> result.nullableNode = convertWrapperType<Node, JSNode>(state, nullableNodeValue, IsNullable::Yes);
</span><span class="lines">@@ -556,6 +562,12 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, Nullopt);
</span><span class="cx"> } else
</span><span class="cx"> result.nullableNode = nullptr;
</span><ins>+ JSValue nullableStringWithDefaultValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "nullableStringWithDefault"));
+ if (!nullableStringWithDefaultValue.isUndefined()) {
+ result.nullableStringWithDefault = convertNullable<String>(state, nullableStringWithDefaultValue);
+ RETURN_IF_EXCEPTION(throwScope, Nullopt);
+ } else
+ result.nullableStringWithDefault = String();
</ins><span class="cx"> JSValue restrictedDoubleValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "restrictedDouble"));
</span><span class="cx"> if (!restrictedDoubleValue.isUndefined()) {
</span><span class="cx"> result.restrictedDouble = convert<double>(state, restrictedDoubleValue, ShouldAllowNonFinite::No);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (207057 => 207058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-11 07:09:54 UTC (rev 207057)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-10-11 07:11:40 UTC (rev 207058)
</span><span class="lines">@@ -433,6 +433,7 @@
</span><span class="cx"> TestEnumType enumerationValueWithEmptyStringDefault = "";
</span><span class="cx"> DOMString stringWithDefault = "defaultString";
</span><span class="cx"> DOMString stringWithoutDefault;
</span><ins>+ DOMString? nullableStringWithDefault = null;
</ins><span class="cx"> boolean booleanWithDefault = false;
</span><span class="cx"> boolean booleanWithoutDefault;
</span><span class="cx"> sequence<DOMString> sequenceOfStrings;
</span><span class="lines">@@ -456,6 +457,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>+ long? nullableIntegerWithDefault = null;
</ins><span class="cx"> Node? nullableNode = null;
</span><span class="cx"> any anyValue;
</span><span class="cx"> any anyValueWithNullDefault = null;
</span></span></pre>
</div>
</div>
</body>
</html>