<!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>[207829] 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/207829">207829</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 11:35:03 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Move more types over to the new JSConverter based toJS functions
https://bugs.webkit.org/show_bug.cgi?id=163920
Reviewed by Darin Adler.
- Adds WebIDL-extension type IDLDate, and use it for Date conversions.
- Move JSDOMIterator over to using IDLType based conversions. Make them more
explicit by adding a traits template argument which describes the iterator.
- Add correct parsing for WebIDL iterable, parsing the parameter types into
domTypes.
- Support non-Optional nullable types via trait-like functions on IDLTypes.
* bindings/generic/IDLTypes.h:
(WebCore::IDLType::isNullValue):
(WebCore::IDLType::extractValueFromNullable):
(WebCore::IDLString::isNullValue):
(WebCore::IDLString::extractValueFromNullable):
(WebCore::IDLInterface::isNullValue):
(WebCore::IDLInterface::extractValueFromNullable):
(WebCore::IDLDate::isNullValue):
(WebCore::IDLDate::extractValueFromNullable):
Add isNullValue and extractValueFromNullable functions to allow non-Optional
based nullable types.
* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::installReplacement):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::toJS):
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::stylePropertyGetter):
* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::invokeAttributeChangedCallback):
Switch to IDLType based toJS.
* bindings/js/JSDOMBinding.cpp:
(WebCore::jsStringOrNull): Deleted.
(WebCore::jsDateOrNull): Deleted.
* bindings/js/JSDOMBinding.h:
(WebCore::jsPair): Deleted.
(WebCore::toJSNullableString): Deleted.
Remove now unusued toJS functions.
* bindings/js/JSDOMConvert.h:
(WebCore::JSConverter<IDLNullable<T>>::convert):
Use new functions to detect and extract nullable values.
(WebCore::Converter<IDLBufferSource>::convert):
Moved to be with the other converters.
(WebCore::Converter<IDLDate>::convert):
(WebCore::JSConverter<IDLDate>::convert):
Added.
* bindings/js/JSDOMIterator.h:
(WebCore::jsPair):
(WebCore::iteratorCreate):
(WebCore::IteratorTraits>::asJS):
(WebCore::appendForEachArguments):
(WebCore::iteratorForEach):
(WebCore::IteratorTraits>::destroy):
(WebCore::IteratorTraits>::next):
(WebCore::IteratorTraits>::finishCreation):
(WebCore::IteratorInspector::decltype): Deleted.
(WebCore::IteratorInspector::test): Deleted.
(WebCore::JSDOMIterator<JSWrapper>::asJS): Deleted.
(WebCore::JSDOMIterator<JSWrapper>::destroy): Deleted.
(WebCore::JSDOMIterator<JSWrapper>::next): Deleted.
(WebCore::JSDOMIteratorPrototype<JSWrapper>::next): Deleted.
(WebCore::JSDOMIteratorPrototype<JSWrapper>::finishCreation): Deleted.
Switch to new Traits based model, and have the generated code pass in
the type (map or set) and key/value types. With the explicit types known,
we can use the new toJS functions.
Also, moved the jsPair functions here from JSDOMBinding.h, since this was
the only place it was used.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementationIterableFunctions):
Add iterator trait definition and update for new parameters to JSDOMIterator
and JSDOMIteratorPrototype.
(GetBaseIDLType):
Add IDLDate, and move IDLBufferSource up to the simple path.
(JSValueToNativeIsHandledByDOMConvert):
Allow Date.
(JSValueToNative):
Remove special case for Date.
(NativeToJSValueIsHandledByDOMConvert):
Allow Date and remove restriction of nullable string-like types.
(NativeToJSValueDOMConvertNeedsState):
Add Date to list of types needing state.
(NativeToJSValue):
Remove special cases for Date and nullable-strings.
* bindings/scripts/IDLParser.pm:
(parseOptionalIterableInterface):
Add correct parsing of iterable.
* bindings/scripts/test/JS/JSTestIterable.cpp:
* bindings/scripts/test/JS/JSTestNode.cpp:
* bindings/scripts/test/JS/JSTestObj.cpp:
Update test results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericIDLTypesh">trunk/Source/WebCore/bindings/generic/IDLTypes.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp">trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMIteratorh">trunk/Source/WebCore/bindings/js/JSDOMIterator.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="#trunkSourceWebCorebindingsscriptstestJSJSTestIterablecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIterable.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -1,3 +1,114 @@
</span><ins>+2016-10-24 Sam Weinig <sam@webkit.org>
+
+ [WebIDL] Move more types over to the new JSConverter based toJS functions
+ https://bugs.webkit.org/show_bug.cgi?id=163920
+
+ Reviewed by Darin Adler.
+
+ - Adds WebIDL-extension type IDLDate, and use it for Date conversions.
+ - Move JSDOMIterator over to using IDLType based conversions. Make them more
+ explicit by adding a traits template argument which describes the iterator.
+ - Add correct parsing for WebIDL iterable, parsing the parameter types into
+ domTypes.
+ - Support non-Optional nullable types via trait-like functions on IDLTypes.
+
+
+ * bindings/generic/IDLTypes.h:
+ (WebCore::IDLType::isNullValue):
+ (WebCore::IDLType::extractValueFromNullable):
+ (WebCore::IDLString::isNullValue):
+ (WebCore::IDLString::extractValueFromNullable):
+ (WebCore::IDLInterface::isNullValue):
+ (WebCore::IDLInterface::extractValueFromNullable):
+ (WebCore::IDLDate::isNullValue):
+ (WebCore::IDLDate::extractValueFromNullable):
+ Add isNullValue and extractValueFromNullable functions to allow non-Optional
+ based nullable types.
+
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ (WebCore::QuickTimePluginReplacement::installReplacement):
+ * bindings/js/IDBBindingUtilities.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::stylePropertyGetter):
+ * bindings/js/JSCustomElementInterface.cpp:
+ (WebCore::JSCustomElementInterface::invokeAttributeChangedCallback):
+ Switch to IDLType based toJS.
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::jsStringOrNull): Deleted.
+ (WebCore::jsDateOrNull): Deleted.
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::jsPair): Deleted.
+ (WebCore::toJSNullableString): Deleted.
+ Remove now unusued toJS functions.
+
+ * bindings/js/JSDOMConvert.h:
+ (WebCore::JSConverter<IDLNullable<T>>::convert):
+ Use new functions to detect and extract nullable values.
+
+ (WebCore::Converter<IDLBufferSource>::convert):
+ Moved to be with the other converters.
+
+ (WebCore::Converter<IDLDate>::convert):
+ (WebCore::JSConverter<IDLDate>::convert):
+ Added.
+
+ * bindings/js/JSDOMIterator.h:
+ (WebCore::jsPair):
+ (WebCore::iteratorCreate):
+ (WebCore::IteratorTraits>::asJS):
+ (WebCore::appendForEachArguments):
+ (WebCore::iteratorForEach):
+ (WebCore::IteratorTraits>::destroy):
+ (WebCore::IteratorTraits>::next):
+ (WebCore::IteratorTraits>::finishCreation):
+ (WebCore::IteratorInspector::decltype): Deleted.
+ (WebCore::IteratorInspector::test): Deleted.
+ (WebCore::JSDOMIterator<JSWrapper>::asJS): Deleted.
+ (WebCore::JSDOMIterator<JSWrapper>::destroy): Deleted.
+ (WebCore::JSDOMIterator<JSWrapper>::next): Deleted.
+ (WebCore::JSDOMIteratorPrototype<JSWrapper>::next): Deleted.
+ (WebCore::JSDOMIteratorPrototype<JSWrapper>::finishCreation): Deleted.
+ Switch to new Traits based model, and have the generated code pass in
+ the type (map or set) and key/value types. With the explicit types known,
+ we can use the new toJS functions.
+
+ Also, moved the jsPair functions here from JSDOMBinding.h, since this was
+ the only place it was used.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementationIterableFunctions):
+ Add iterator trait definition and update for new parameters to JSDOMIterator
+ and JSDOMIteratorPrototype.
+
+ (GetBaseIDLType):
+ Add IDLDate, and move IDLBufferSource up to the simple path.
+
+ (JSValueToNativeIsHandledByDOMConvert):
+ Allow Date.
+
+ (JSValueToNative):
+ Remove special case for Date.
+
+ (NativeToJSValueIsHandledByDOMConvert):
+ Allow Date and remove restriction of nullable string-like types.
+
+ (NativeToJSValueDOMConvertNeedsState):
+ Add Date to list of types needing state.
+
+ (NativeToJSValue):
+ Remove special cases for Date and nullable-strings.
+
+ * bindings/scripts/IDLParser.pm:
+ (parseOptionalIterableInterface):
+ Add correct parsing of iterable.
+
+ * bindings/scripts/test/JS/JSTestIterable.cpp:
+ * bindings/scripts/test/JS/JSTestNode.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ Update test results.
+
</ins><span class="cx"> 2016-10-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Add "has capture device" bit to media state flags
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> argList.append(toJS(exec, globalObject, &root));
</span><span class="cx"> argList.append(toJS(exec, globalObject, m_parentElement));
</span><span class="cx"> argList.append(toJS(exec, globalObject, this));
</span><del>- argList.append(toJS<String>(exec, globalObject, m_names));
- argList.append(toJS<String>(exec, globalObject, m_values));
</del><ins>+ argList.append(toJS<IDLSequence<IDLNullable<IDLDOMString>>>(*exec, *globalObject, m_names));
+ argList.append(toJS<IDLSequence<IDLNullable<IDLDOMString>>>(*exec, *globalObject, m_values));
</ins><span class="cx"> JSC::JSValue replacement = call(exec, replacementObject, callType, callData, globalObject, argList);
</span><span class="cx"> if (UNLIKELY(scope.exception())) {
</span><span class="cx"> scope.clearException();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericIDLTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/IDLTypes.h (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -41,11 +41,13 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> struct IDLType {
</span><span class="cx"> using ImplementationType = T;
</span><ins>+
</ins><span class="cx"> using NullableType = Optional<ImplementationType>;
</span><ins>+ static NullableType nullValue() { return Nullopt; }
+ static bool isNullValue(const NullableType& value) { return !value; }
+ static ImplementationType extractValueFromNullable(const NullableType& value) { return value.value(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-struct IDLDummy;
-
</del><span class="cx"> // IDLUnsupportedType is a special type that serves as a base class for currently unsupported types.
</span><span class="cx"> struct IDLUnsupportedType : IDLType<void> { };
</span><span class="cx">
</span><span class="lines">@@ -78,6 +80,9 @@
</span><span class="cx">
</span><span class="cx"> struct IDLString : IDLType<String> {
</span><span class="cx"> using NullableType = String;
</span><ins>+ static String nullValue() { return String(); }
+ static bool isNullValue(const String& value) { return value.isNull(); }
+ static const String& extractValueFromNullable(const String& value) { return value; }
</ins><span class="cx"> };
</span><span class="cx"> struct IDLDOMString : IDLString { };
</span><span class="cx"> struct IDLByteString : IDLUnsupportedType { };
</span><span class="lines">@@ -87,7 +92,11 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> struct IDLInterface : IDLType<RefPtr<T>> {
</span><span class="cx"> using RawType = T;
</span><ins>+
</ins><span class="cx"> using NullableType = RefPtr<T>;
</span><ins>+ static RefPtr<T> nullValue() { return nullptr; }
+ static bool isNullValue(const RefPtr<T>& value) { return !value; }
+ static const RefPtr<T>& extractValueFromNullable(const RefPtr<T>& value) { return value; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct IDLDictionary : IDLType<T> { };
</span><span class="lines">@@ -119,6 +128,15 @@
</span><span class="cx"> using TypeList = brigand::list<Ts...>;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// Non-WebIDL extensions
+
+struct IDLDate : IDLType<double> {
+ using NullableType = double;
+ static double nullValue() { return std::numeric_limits<double>::quiet_NaN(); }
+ static bool isNullValue(double value) { return std::isnan(value); }
+ static double extractValueFromNullable(double value) { return value; }
+};
+
</ins><span class="cx"> struct IDLBufferSource : IDLType<BufferSource> { };
</span><span class="cx">
</span><span class="cx"> // Helper predicates
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -107,9 +107,9 @@
</span><span class="cx"> case KeyType::String:
</span><span class="cx"> return jsStringWithCache(&state, key->string());
</span><span class="cx"> case KeyType::Date:
</span><del>- // FIXME: This should probably be jsDate() as per:
</del><ins>+ // FIXME: This should probably be toJS<IDLDate>(...) as per:
</ins><span class="cx"> // http://w3c.github.io/IndexedDB/#request-convert-a-key-to-a-value
</span><del>- return jsDateOrNull(&state, key->date());
</del><ins>+ return toJS<IDLNullable<IDLDate>>(state, key->date());
</ins><span class="cx"> case KeyType::Number:
</span><span class="cx"> return jsNumber(key->number());
</span><span class="cx"> case KeyType::Min:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -283,9 +283,9 @@
</span><span class="cx"> static inline JSValue stylePropertyGetter(ExecState& state, JSCSSStyleDeclaration& thisObject, CSSPropertyID propertyID, const RefPtr<CSSValue>& value)
</span><span class="cx"> {
</span><span class="cx"> if (value)
</span><del>- return jsStringOrNull(&state, value->cssText());
</del><ins>+ return toJS<IDLNullable<IDLDOMString>>(state, value->cssText());
</ins><span class="cx"> // If the property is a shorthand property (such as "padding"), it can only be accessed using getPropertyValue.
</span><del>- return jsStringWithCache(&state, thisObject.wrapped().getPropertyValueInternal(propertyID));
</del><ins>+ return toJS<IDLDOMString>(state, thisObject.wrapped().getPropertyValueInternal(propertyID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSValue stylePropertyGetter(ExecState& state, JSCSSStyleDeclaration& thisObject, CSSPropertyID propertyID)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -289,10 +289,10 @@
</span><span class="cx"> void JSCustomElementInterface::invokeAttributeChangedCallback(Element& element, const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> invokeCallback(element, m_attributeChangedCallback.get(), [&](ExecState* state, JSDOMGlobalObject*, MarkedArgumentBuffer& args) {
</span><del>- args.append(jsStringWithCache(state, attributeName.localName()));
- args.append(jsStringOrNull(state, oldValue));
- args.append(jsStringOrNull(state, newValue));
- args.append(jsStringOrNull(state, attributeName.namespaceURI()));
</del><ins>+ args.append(toJS<IDLDOMString>(*state, attributeName.localName()));
+ args.append(toJS<IDLNullable<IDLDOMString>>(*state, oldValue));
+ args.append(toJS<IDLNullable<IDLDOMString>>(*state, newValue));
+ args.append(toJS<IDLNullable<IDLDOMString>>(*state, attributeName.namespaceURI()));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -64,13 +64,6 @@
</span><span class="cx"> JSDOMWindow::commonVM().addImpureProperty(propertyName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsStringOrNull(ExecState* exec, const String& s)
-{
- if (s.isNull())
- return jsNull();
- return jsStringWithCache(exec, s);
-}
-
</del><span class="cx"> JSValue jsOwnedStringOrNull(ExecState* exec, const String& s)
</span><span class="cx"> {
</span><span class="cx"> if (s.isNull())
</span><span class="lines">@@ -90,13 +83,6 @@
</span><span class="cx"> return jsStringWithCache(exec, url.string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsStringOrNull(ExecState* exec, const URL& url)
-{
- if (url.isNull())
- return jsNull();
- return jsStringWithCache(exec, url.string());
-}
-
</del><span class="cx"> JSValue jsStringOrUndefined(ExecState* exec, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> if (url.isNull())
</span><span class="lines">@@ -171,14 +157,6 @@
</span><span class="cx"> return DateInstance::create(exec->vm(), exec->lexicalGlobalObject()->dateStructure(), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue jsDateOrNull(ExecState* exec, double value)
-{
- // For nullable Date types, we use NaN as null value.
- if (std::isnan(value))
- return jsNull();
- return DateInstance::create(exec->vm(), exec->lexicalGlobalObject()->dateStructure(), value);
-}
-
</del><span class="cx"> double valueToDate(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> if (value.isNumber())
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -202,9 +202,6 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue jsString(JSC::ExecState*, const URL&); // empty if the URL is null
</span><span class="cx">
</span><del>-JSC::JSValue jsStringOrNull(JSC::ExecState*, const String&); // null if the string is null
-JSC::JSValue jsStringOrNull(JSC::ExecState*, const URL&); // null if the URL is null
-
</del><span class="cx"> JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const String&); // undefined if the string is null
</span><span class="cx"> JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const URL&); // undefined if the URL is null
</span><span class="cx">
</span><span class="lines">@@ -257,7 +254,6 @@
</span><span class="cx"> WEBCORE_EXPORT uint64_t toUInt64(JSC::ExecState&, JSC::JSValue);
</span><span class="cx">
</span><span class="cx"> JSC::JSValue jsDate(JSC::ExecState*, double value);
</span><del>-JSC::JSValue jsDateOrNull(JSC::ExecState*, double value);
</del><span class="cx">
</span><span class="cx"> // NaN if the value can't be converted to a date.
</span><span class="cx"> double valueToDate(JSC::ExecState*, JSC::JSValue);
</span><span class="lines">@@ -273,17 +269,12 @@
</span><span class="cx"> template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, RefPtr<T>&&);
</span><span class="cx"> template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<T>&);
</span><span class="cx"> template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<RefPtr<T>>&);
</span><del>-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const String&);
</del><span class="cx"> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const JSC::PrivateName&);
</span><span class="cx">
</span><span class="cx"> JSC::JSValue toJSIterator(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSValue);
</span><span class="cx"> template<typename T> JSC::JSValue toJSIterator(JSC::ExecState&, JSDOMGlobalObject&, const T&);
</span><del>-
</del><span class="cx"> JSC::JSValue toJSIteratorEnd(JSC::ExecState&);
</span><span class="cx">
</span><del>-JSC::JSValue jsPair(JSC::ExecState&, JSDOMGlobalObject*, JSC::JSValue, JSC::JSValue);
-template<typename FirstType, typename SecondType> JSC::JSValue jsPair(JSC::ExecState&, JSDOMGlobalObject*, const FirstType&, const SecondType&);
-
</del><span class="cx"> RefPtr<JSC::ArrayBufferView> toArrayBufferView(JSC::JSValue);
</span><span class="cx"> RefPtr<JSC::Int8Array> toInt8Array(JSC::JSValue);
</span><span class="cx"> RefPtr<JSC::Int16Array> toInt16Array(JSC::JSValue);
</span><span class="lines">@@ -405,9 +396,6 @@
</span><span class="cx"> // ExceptionOr handling.
</span><span class="cx"> void propagateException(JSC::ExecState&, JSC::ThrowScope&, ExceptionOr<void>&&);
</span><span class="cx"> template<typename T> JSC::JSValue toJS(JSC::ExecState&, JSDOMGlobalObject&, JSC::ThrowScope&, ExceptionOr<T>&&);
</span><del>-JSC::JSValue toJSDate(JSC::ExecState&, JSC::ThrowScope&, ExceptionOr<double>&&);
-JSC::JSValue toJSNullableDate(JSC::ExecState&, JSC::ThrowScope&, ExceptionOr<Optional<double>>&&);
-JSC::JSValue toJSNullableString(JSC::ExecState&, JSC::ThrowScope&, ExceptionOr<String>&&);
</del><span class="cx"> template<typename T> JSC::JSValue toJSNewlyCreated(JSC::ExecState&, JSDOMGlobalObject&, JSC::ThrowScope&, ExceptionOr<T>&& value);
</span><span class="cx">
</span><span class="cx"> // Inline functions and template definitions.
</span><span class="lines">@@ -683,11 +671,6 @@
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject*, const String& value)
-{
- return jsStringOrNull(exec, value);
-}
-
</del><span class="cx"> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject*, const JSC::PrivateName& privateName)
</span><span class="cx"> {
</span><span class="cx"> return JSC::Symbol::create(exec->vm(), privateName.uid());
</span><span class="lines">@@ -708,19 +691,6 @@
</span><span class="cx"> return createIteratorResultObject(&state, JSC::jsUndefined(), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSC::JSValue jsPair(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::JSValue value1, JSC::JSValue value2)
-{
- JSC::MarkedArgumentBuffer args;
- args.append(value1);
- args.append(value2);
- return constructArray(&state, 0, globalObject, args);
-}
-
-template<typename FirstType, typename SecondType> inline JSC::JSValue jsPair(JSC::ExecState& state, JSDOMGlobalObject* globalObject, const FirstType& value1, const SecondType& value2)
-{
- return jsPair(state, globalObject, toJS(&state, globalObject, value1), toJS(&state, globalObject, value2));
-}
-
</del><span class="cx"> inline RefPtr<JSC::ArrayBufferView> toArrayBufferView(JSC::JSValue value)
</span><span class="cx"> {
</span><span class="cx"> auto* wrapper = JSC::jsDynamicCast<JSC::JSArrayBufferView*>(value);
</span><span class="lines">@@ -817,13 +787,4 @@
</span><span class="cx"> return toJSNewlyCreated(&state, &globalObject, value.releaseReturnValue());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSC::JSValue toJSNullableString(JSC::ExecState& state, JSC::ThrowScope& throwScope, ExceptionOr<String>&& value)
-{
- if (UNLIKELY(value.hasException())) {
- propagateException(state, throwScope, value.releaseException());
- return { };
- }
- return jsStringOrNull(&state, value.releaseReturnValue());
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -164,10 +164,8 @@
</span><span class="cx"> // NOTE: Handled elsewhere.
</span><span class="cx">
</span><span class="cx"> // 2. Otherwise, if V is null or undefined, then return the IDL nullable type T? value null.
</span><del>- if (value.isUndefinedOrNull()) {
- // FIXME: Should we make it part of the IDLType to provide the null value?
- return ReturnType();
- }
</del><ins>+ if (value.isUndefinedOrNull())
+ return T::nullValue();
</ins><span class="cx">
</span><span class="cx"> // 3. Otherwise, return the result of converting V using the rules for the inner IDL type T.
</span><span class="cx"> return Converter<T>::convert(state, value);
</span><span class="lines">@@ -180,26 +178,23 @@
</span><span class="cx"> static constexpr bool needsState = JSConverter<T>::needsState;
</span><span class="cx"> static constexpr bool needsGlobalObject = JSConverter<T>::needsGlobalObject;
</span><span class="cx">
</span><del>- // FIXME: These only work if ImplementationType is an Optional. We should generalize
- // this so it can work for types that don't use Optional to represent nullness, like
- // String and interface types.
</del><span class="cx"> static JSC::JSValue convert(const ImplementationType& value)
</span><span class="cx"> {
</span><del>- if (!value)
</del><ins>+ if (T::isNullValue(value))
</ins><span class="cx"> return JSC::jsNull();
</span><del>- return JSConverter<T>::convert(value.value());
</del><ins>+ return JSConverter<T>::convert(T::extractValueFromNullable(value));
</ins><span class="cx"> }
</span><span class="cx"> static JSC::JSValue convert(JSC::ExecState& state, const ImplementationType& value)
</span><span class="cx"> {
</span><del>- if (!value)
</del><ins>+ if (T::isNullValue(value))
</ins><span class="cx"> return JSC::jsNull();
</span><del>- return JSConverter<T>::convert(state, value.value());
</del><ins>+ return JSConverter<T>::convert(state, T::extractValueFromNullable(value));
</ins><span class="cx"> }
</span><span class="cx"> static JSC::JSValue convert(JSC::ExecState& state, JSDOMGlobalObject& globalObject, const ImplementationType& value)
</span><span class="cx"> {
</span><del>- if (!value)
</del><ins>+ if (T::isNullValue(value))
</ins><span class="cx"> return JSC::jsNull();
</span><del>- return JSConverter<T>::convert(state, globalObject, value.value());
</del><ins>+ return JSConverter<T>::convert(state, globalObject, T::extractValueFromNullable(value));
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1010,6 +1005,47 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // MARK: -
</span><ins>+// MARK: BufferSource type
+
+template<> struct Converter<IDLBufferSource> : DefaultConverter<IDLBufferSource> {
+ using ReturnType = BufferSource;
+
+ static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
+ {
+ JSC::VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ if (JSC::ArrayBuffer* buffer = JSC::toArrayBuffer(value))
+ return { static_cast<uint8_t*>(buffer->data()), buffer->byteLength() };
+ if (RefPtr<JSC::ArrayBufferView> bufferView = toArrayBufferView(value))
+ return { static_cast<uint8_t*>(bufferView->baseAddress()), bufferView->byteLength() };
+
+ throwTypeError(&state, scope, ASCIILiteral("Only ArrayBuffer and ArrayBufferView objects can be passed as BufferSource arguments"));
+ return { nullptr, 0 };
+ }
+};
+
+// MARK: -
+// MARK: Date type
+
+template<> struct Converter<IDLDate> : DefaultConverter<IDLDate> {
+ static double convert(JSC::ExecState& state, JSC::JSValue value)
+ {
+ return valueToDate(&state, value);
+ }
+};
+
+template<> struct JSConverter<IDLDate> {
+ static constexpr bool needsState = true;
+ static constexpr bool needsGlobalObject = false;
+
+ static JSC::JSValue convert(JSC::ExecState& state, double value)
+ {
+ return jsDate(&state, value);
+ }
+};
+
+// MARK: -
</ins><span class="cx"> // MARK: Support for variadic tail convertions
</span><span class="cx">
</span><span class="cx"> namespace Detail {
</span><span class="lines">@@ -1076,25 +1112,4 @@
</span><span class="cx"> return { length, WTFMove(result) };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// MARK: -
-// MARK: BufferSource type
-
-template<> struct Converter<IDLBufferSource> : DefaultConverter<IDLBufferSource> {
- using ReturnType = BufferSource;
-
- static ReturnType convert(JSC::ExecState& state, JSC::JSValue value)
- {
- JSC::VM& vm = state.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- if (JSC::ArrayBuffer* buffer = JSC::toArrayBuffer(value))
- return { static_cast<uint8_t*>(buffer->data()), buffer->byteLength() };
- if (RefPtr<JSC::ArrayBufferView> bufferView = toArrayBufferView(value))
- return { static_cast<uint8_t*>(bufferView->baseAddress()), bufferView->byteLength() };
-
- throwTypeError(&state, scope, ASCIILiteral("Only ArrayBuffer and ArrayBufferView objects can be passed as BufferSource arguments"));
- return { nullptr, 0 };
- }
-};
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -24,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef JSDOMIterator_h
-#define JSDOMIterator_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include <runtime/IteratorPrototype.h>
</span><span class="lines">@@ -36,8 +35,15 @@
</span><span class="cx">
</span><span class="cx"> void addValueIterableMethods(JSC::JSGlobalObject&, JSC::JSObject&);
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-class JSDOMIteratorPrototype : public JSC::JSNonFinalObject {
</del><ins>+enum class JSDOMIteratorType { Set, Map };
+
+// struct IteratorTraits {
+// static constexpr JSDOMIteratorType type = [Map|Set];
+// using KeyType = [IDLType|void];
+// using ValueType = [IDLType];
+// };
+
+template<typename JSWrapper, typename IteratorTraits> class JSDOMIteratorPrototype : public JSC::JSNonFinalObject {
</ins><span class="cx"> public:
</span><span class="cx"> using Base = JSC::JSNonFinalObject;
</span><span class="cx"> using DOMWrapped = typename JSWrapper::DOMWrapped;
</span><span class="lines">@@ -64,24 +70,18 @@
</span><span class="cx"> void finishCreation(JSC::VM&, JSC::JSGlobalObject*);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename IteratorValue>
-class IteratorInspector {
-private:
- template<typename T> static constexpr auto test(int) -> decltype(std::declval<T>()->key, std::declval<T>()->value, bool()) { return true; }
- template<typename T> static constexpr bool test(...) { return false; }
-public:
- static constexpr bool isMap = test<IteratorValue>(0);
- static constexpr bool isSet = !isMap;
-};
-
</del><span class="cx"> enum class IterationKind { Key, Value, KeyValue };
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-class JSDOMIterator: public JSDOMObject {
</del><ins>+template<typename JSWrapper, typename IteratorTraits> class JSDOMIterator : public JSDOMObject {
</ins><span class="cx"> public:
</span><del>- using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
</del><span class="cx"> using Base = JSDOMObject;
</span><span class="cx">
</span><ins>+ using Wrapper = JSWrapper;
+ using Traits = IteratorTraits;
+
+ using DOMWrapped = typename Wrapper::DOMWrapped;
+ using Prototype = JSDOMIteratorPrototype<Wrapper, Traits>;
+
</ins><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
</span><span class="lines">@@ -96,10 +96,9 @@
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static JSDOMIteratorPrototype<JSWrapper>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</del><ins>+ static Prototype* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</ins><span class="cx"> {
</span><del>- return JSDOMIteratorPrototype<JSWrapper>::create(vm, globalObject,
- JSDOMIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->iteratorPrototype()));
</del><ins>+ return Prototype::create(vm, globalObject, Prototype::createStructure(vm, globalObject, globalObject->iteratorPrototype()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue next(JSC::ExecState&);
</span><span class="lines">@@ -112,10 +111,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
- asJS(JSC::ExecState&, IteratorValue&);
- template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
- asJS(JSC::ExecState&, IteratorValue&);
</del><ins>+ template<typename IteratorValue, typename T = Traits> typename std::enable_if<T::type == JSDOMIteratorType::Map, JSC::JSValue>::type asJS(JSC::ExecState&, IteratorValue&);
+ template<typename IteratorValue, typename T = Traits> typename std::enable_if<T::type == JSDOMIteratorType::Set, JSC::JSValue>::type asJS(JSC::ExecState&, IteratorValue&);
</ins><span class="cx">
</span><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><span class="lines">@@ -123,61 +120,91 @@
</span><span class="cx"> IterationKind m_kind;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-JSC::JSValue iteratorCreate(JSWrapper&, IterationKind);
-template<typename JSWrapper>
-JSC::JSValue iteratorForEach(JSC::ExecState&, JSWrapper&, JSC::ThrowScope&);
</del><ins>+inline JSC::JSValue jsPair(JSC::ExecState& state, JSDOMGlobalObject& globalObject, JSC::JSValue value1, JSC::JSValue value2)
+{
+ JSC::MarkedArgumentBuffer arguments;
+ arguments.append(value1);
+ arguments.append(value2);
+ return constructArray(&state, nullptr, &globalObject, arguments);
+}
</ins><span class="cx">
</span><del>-template<typename JSWrapper>
-JSC::JSValue iteratorCreate(JSWrapper& thisObject, IterationKind kind)
</del><ins>+template<typename FirstType, typename SecondType, typename T, typename U>
+inline JSC::JSValue jsPair(JSC::ExecState& state, JSDOMGlobalObject& globalObject, const T& value1, const U& value2)
</ins><span class="cx"> {
</span><ins>+ return jsPair(state, globalObject, toJS<FirstType>(state, globalObject, value1), toJS<SecondType>(state, globalObject, value2));
+}
+
+template<typename JSIterator>
+JSC::JSValue iteratorCreate(typename JSIterator::Wrapper&, IterationKind);
+template<typename JSIterator>
+JSC::JSValue iteratorForEach(JSC::ExecState&, typename JSIterator::Wrapper&, JSC::ThrowScope&);
+
+template<typename JSIterator>
+JSC::JSValue iteratorCreate(typename JSIterator::Wrapper& thisObject, IterationKind kind)
+{
</ins><span class="cx"> ASSERT(thisObject.globalObject());
</span><span class="cx"> JSDOMGlobalObject& globalObject = *thisObject.globalObject();
</span><del>- return JSDOMIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSDOMIterator<JSWrapper>>(globalObject.vm(), globalObject), thisObject, kind);
</del><ins>+ return JSIterator::create(globalObject.vm(), getDOMStructure<JSIterator>(globalObject.vm(), globalObject), thisObject, kind);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-template<typename IteratorValue> inline typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
-JSDOMIterator<JSWrapper>::asJS(JSC::ExecState& state, IteratorValue& value)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+template<typename IteratorValue, typename T>
+inline typename std::enable_if<T::type == JSDOMIteratorType::Map, JSC::JSValue>::type JSDOMIterator<JSWrapper, IteratorTraits>::asJS(JSC::ExecState& state, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- if (m_kind != IterationKind::KeyValue)
- return toJS(&state, globalObject(), (m_kind == IterationKind::Key) ? value->key : value->value);
-
- return jsPair(state, globalObject(), value->key, value->value);
</del><ins>+
+ switch (m_kind) {
+ case IterationKind::Key:
+ return toJS<typename Traits::KeyType>(state, *globalObject(), value->key);
+ case IterationKind::Value:
+ return toJS<typename Traits::ValueType>(state, *globalObject(), value->value);
+ case IterationKind::KeyValue:
+ return jsPair<typename Traits::KeyType, typename Traits::ValueType>(state, *globalObject(), value->key, value->value);
+ };
+
+ ASSERT_NOT_REACHED();
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-template<typename IteratorValue> inline typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
-JSDOMIterator<JSWrapper>::asJS(JSC::ExecState& state, IteratorValue& value)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+template<typename IteratorValue, typename T>
+inline typename std::enable_if<T::type == JSDOMIteratorType::Set, JSC::JSValue>::type JSDOMIterator<JSWrapper, IteratorTraits>::asJS(JSC::ExecState& state, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- JSC::JSValue result = toJS(&state, globalObject(), *value);
- if (m_kind != IterationKind::KeyValue)
</del><ins>+
+ auto globalObject = this->globalObject();
+ auto result = toJS<typename Traits::ValueType>(state, *globalObject, value);
+
+ switch (m_kind) {
+ case IterationKind::Key:
+ case IterationKind::Value:
</ins><span class="cx"> return result;
</span><ins>+ case IterationKind::KeyValue:
+ return jsPair(state, *globalObject, result, result);
+ };
</ins><span class="cx">
</span><del>- return jsPair(state, globalObject(), result, result);
</del><ins>+ ASSERT_NOT_REACHED();
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, void>::type
-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</del><ins>+template<typename JSIterator, typename IteratorValue>
+typename std::enable_if<JSIterator::Traits::type == JSDOMIteratorType::Map, void>::type appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject& globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- arguments.append(toJS(&state, globalObject, value->value));
- arguments.append(toJS(&state, globalObject, value->key));
</del><ins>+ arguments.append(toJS<typename JSIterator::Traits::ValueType>(state, globalObject, value->value));
+ arguments.append(toJS<typename JSIterator::Traits::KeyType>(state, globalObject, value->key));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, void>::type
-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</del><ins>+template<typename JSIterator, typename IteratorValue>
+typename std::enable_if<JSIterator::Traits::type == JSDOMIteratorType::Set, void>::type appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject& globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- JSC::JSValue argument = toJS(&state, globalObject, *value);
</del><ins>+ auto argument = toJS<typename JSIterator::Traits::ValueType>(state, globalObject, value);
</ins><span class="cx"> arguments.append(argument);
</span><span class="cx"> arguments.append(argument);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-JSC::JSValue iteratorForEach(JSC::ExecState& state, JSWrapper& thisObject, JSC::ThrowScope& scope)
</del><ins>+template<typename JSIterator> JSC::JSValue iteratorForEach(JSC::ExecState& state, typename JSIterator::Wrapper& thisObject, JSC::ThrowScope& scope)
</ins><span class="cx"> {
</span><span class="cx"> JSC::JSValue callback = state.argument(0);
</span><span class="cx"> JSC::JSValue thisValue = state.argument(1);
</span><span class="lines">@@ -190,7 +217,7 @@
</span><span class="cx"> auto iterator = thisObject.wrapped().createIterator();
</span><span class="cx"> while (auto value = iterator.next()) {
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><del>- appendForEachArguments(state, thisObject.globalObject(), arguments, value);
</del><ins>+ appendForEachArguments<JSIterator>(state, *thisObject.globalObject(), arguments, value);
</ins><span class="cx"> arguments.append(&thisObject);
</span><span class="cx"> JSC::call(&state, callback, callType, callData, thisValue, arguments);
</span><span class="cx"> if (UNLIKELY(scope.exception()))
</span><span class="lines">@@ -199,15 +226,15 @@
</span><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-void JSDOMIterator<JSWrapper>::destroy(JSCell* cell)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+void JSDOMIterator<JSWrapper, IteratorTraits>::destroy(JSCell* cell)
</ins><span class="cx"> {
</span><del>- JSDOMIterator<JSWrapper>* thisObject = JSC::jsCast<JSDOMIterator<JSWrapper>*>(cell);
- thisObject->JSDOMIterator<JSWrapper>::~JSDOMIterator();
</del><ins>+ JSDOMIterator<JSWrapper, IteratorTraits>* thisObject = JSC::jsCast<JSDOMIterator<JSWrapper, IteratorTraits>*>(cell);
+ thisObject->JSDOMIterator<JSWrapper, IteratorTraits>::~JSDOMIterator();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-JSC::JSValue JSDOMIterator<JSWrapper>::next(JSC::ExecState& state)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+JSC::JSValue JSDOMIterator<JSWrapper, IteratorTraits>::next(JSC::ExecState& state)
</ins><span class="cx"> {
</span><span class="cx"> if (m_iterator) {
</span><span class="cx"> auto iteratorValue = m_iterator->next();
</span><span class="lines">@@ -218,13 +245,13 @@
</span><span class="cx"> return createIteratorResultObject(&state, JSC::jsUndefined(), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-JSC::EncodedJSValue JSC_HOST_CALL JSDOMIteratorPrototype<JSWrapper>::next(JSC::ExecState* state)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+JSC::EncodedJSValue JSC_HOST_CALL JSDOMIteratorPrototype<JSWrapper, IteratorTraits>::next(JSC::ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSC::VM& vm = state->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- auto iterator = JSC::jsDynamicCast<JSDOMIterator<JSWrapper>*>(state->thisValue());
</del><ins>+ auto iterator = JSC::jsDynamicCast<JSDOMIterator<JSWrapper, IteratorTraits>*>(state->thisValue());
</ins><span class="cx"> if (!iterator)
</span><span class="cx"> return JSC::JSValue::encode(throwTypeError(state, scope, ASCIILiteral("Cannot call next() on a non-Iterator object")));
</span><span class="cx">
</span><span class="lines">@@ -231,8 +258,8 @@
</span><span class="cx"> return JSC::JSValue::encode(iterator->next(*state));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-void JSDOMIteratorPrototype<JSWrapper>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</del><ins>+template<typename JSWrapper, typename IteratorTraits>
+void JSDOMIteratorPrototype<JSWrapper, IteratorTraits>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
</ins><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="lines">@@ -241,5 +268,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // !defined(JSDOMIterator_h)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -4865,15 +4865,29 @@
</span><span class="cx">
</span><span class="cx"> return unless IsKeyValueIterableInterface($interface);
</span><span class="cx">
</span><ins>+ my $iteratorName = "${interfaceName}Iterator";
+ my $iteratorPrototypeName = "${interfaceName}IteratorPrototype";
+
+ my $iteratorTraitsName = "${interfaceName}IteratorTraits";
+ my $iteratorTraitsType = $interface->iterable->isKeyValue ? "JSDOMIteratorType::Map" : "JSDOMIteratorType::Set";
+ my $iteratorTraitsKeyType = $interface->iterable->isKeyValue ? GetIDLType($interface, $interface->iterable->idlKeyType) : "void";
+ my $iteratorTraitsValueType = GetIDLType($interface, $interface->iterable->idlValueType);
+
</ins><span class="cx"> push(@implContent, <<END);
</span><del>-using ${interfaceName}Iterator = JSDOMIterator<${className}>;
-using ${interfaceName}IteratorPrototype = JSDOMIteratorPrototype<${className}>;
</del><ins>+struct ${iteratorTraitsName} {
+ static constexpr JSDOMIteratorType type = ${iteratorTraitsType};
+ using KeyType = ${iteratorTraitsKeyType};
+ using ValueType = ${iteratorTraitsValueType};
+};
</ins><span class="cx">
</span><ins>+using ${iteratorName} = JSDOMIterator<${className}, ${iteratorTraitsName}>;
+using ${iteratorPrototypeName} = JSDOMIteratorPrototype<${className}, ${iteratorTraitsName}>;
+
</ins><span class="cx"> template<>
</span><del>-const JSC::ClassInfo ${interfaceName}Iterator::s_info = { "${visibleInterfaceName} Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(${interfaceName}Iterator) };
</del><ins>+const JSC::ClassInfo ${iteratorName}::s_info = { "${visibleInterfaceName} Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(${iteratorName}) };
</ins><span class="cx">
</span><span class="cx"> template<>
</span><del>-const JSC::ClassInfo ${interfaceName}IteratorPrototype::s_info = { "${visibleInterfaceName} Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(${interfaceName}IteratorPrototype) };
</del><ins>+const JSC::ClassInfo ${iteratorPrototypeName}::s_info = { "${visibleInterfaceName} Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(${iteratorPrototypeName}) };
</ins><span class="cx">
</span><span class="cx"> END
</span><span class="cx">
</span><span class="lines">@@ -4885,7 +4899,7 @@
</span><span class="cx"> push(@implContent, <<END);
</span><span class="cx"> static inline EncodedJSValue ${functionName}Caller(ExecState* state, JS$interfaceName* thisObject, JSC::ThrowScope& throwScope)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorForEach<${className}>(*state, *thisObject, throwScope));
</del><ins>+ return JSValue::encode(iteratorForEach<${iteratorName}>(*state, *thisObject, throwScope));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> END
</span><span class="lines">@@ -4898,7 +4912,7 @@
</span><span class="cx"> push(@implContent, <<END);
</span><span class="cx"> static inline EncodedJSValue ${functionName}Caller(ExecState*, JS$interfaceName* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<${className}>(*thisObject, IterationKind::${iterationKind}));
</del><ins>+ return JSValue::encode(iteratorCreate<${iteratorName}>(*thisObject, IterationKind::${iterationKind}));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> END
</span><span class="lines">@@ -5047,6 +5061,10 @@
</span><span class="cx"> "DOMString" => "IDLDOMString",
</span><span class="cx"> "ByteString" => "IDLByteString",
</span><span class="cx"> "USVString" => "IDLUSVString",
</span><ins>+
+ # Non-WebIDL extensions
+ "Date" => "IDLDate",
+ "BufferSource" => "IDLBufferSource",
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> return $IDLTypes{$idlType->name} if exists $IDLTypes{$idlType->name};
</span><span class="lines">@@ -5055,7 +5073,6 @@
</span><span class="cx"> return "IDLSequence<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsSequenceType($idlType->name);
</span><span class="cx"> return "IDLFrozenArray<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsFrozenArrayType($idlType->name);
</span><span class="cx"> return "IDLUnion<" . join(", ", GetIDLUnionMemberTypes($interface, $idlType)) . ">" if $idlType->isUnion;
</span><del>- return "IDLBufferSource" if $idlType->name eq "BufferSource";
</del><span class="cx"> return "IDLInterface<" . $idlType->name . ">";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5177,9 +5194,10 @@
</span><span class="cx"> my $idlType = shift;
</span><span class="cx">
</span><span class="cx"> return 1 if $idlType->isUnion;
</span><del>- return 1 if $idlType->name eq "BufferSource";
</del><span class="cx"> return 1 if $idlType->name eq "any";
</span><span class="cx"> return 1 if $idlType->name eq "boolean";
</span><ins>+ return 1 if $idlType->name eq "Date";
+ return 1 if $idlType->name eq "BufferSource";
</ins><span class="cx"> return 1 if $codeGenerator->IsIntegerType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsFloatingPointType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
</span><span class="lines">@@ -5241,7 +5259,6 @@
</span><span class="cx"> return ("Dictionary($statePointer, $value)", 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return ("valueToDate($statePointer, $value)", 1) if $type eq "Date";
</del><span class="cx"> return ("to$type($value)", 1) if $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return ("parseEnumeration<" . GetEnumerationClassName($type, $interface) . ">($stateReference, $value)", 1) if $codeGenerator->IsEnumType($type);
</span><span class="cx">
</span><span class="lines">@@ -5258,11 +5275,10 @@
</span><span class="cx"> sub NativeToJSValueIsHandledByDOMConvert
</span><span class="cx"> {
</span><span class="cx"> my ($idlType) = @_;
</span><del>-
- return 0 if $idlType->isNullable && ($codeGenerator->IsStringType($idlType->name) || $codeGenerator->IsEnumType($idlType->name));
</del><span class="cx">
</span><span class="cx"> return 1 if $idlType->name eq "any";
</span><span class="cx"> return 1 if $idlType->name eq "boolean";
</span><ins>+ return 1 if $idlType->name eq "Date";
</ins><span class="cx"> return 1 if $codeGenerator->IsIntegerType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsFloatingPointType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsStringType($idlType->name);
</span><span class="lines">@@ -5282,6 +5298,7 @@
</span><span class="cx"> return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsStringType($idlType->name);
</span><span class="cx"> return 1 if $codeGenerator->IsEnumType($idlType->name);
</span><ins>+ return 1 if $idlType->name eq "Date";
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -5360,18 +5377,6 @@
</span><span class="cx"> return "toJS<$IDLType>(" . join(", ", @conversionArguments) . ")";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return "toJSNullableDate($stateReference, throwScope, $value)" if $type eq "Date" && $isNullable && $mayThrowException;
- return "jsDateOrNull($statePointer, $value)" if $type eq "Date" && $isNullable;
- return "toJSDate($stateReference, throwScope, $value)" if $type eq "Date" && $mayThrowException;
- return "jsDate($statePointer, $value)" if $type eq "Date";
-
- if ($codeGenerator->IsStringType($type)) {
- AddToImplIncludes("URL.h", $conditional);
- return "toJSNullableString($stateReference, throwScope, $value)" if $isNullable && $mayThrowException;
- return "jsStringOrNull($statePointer, $value)" if $isNullable;
- assert("Unhandled string type");
- }
-
</del><span class="cx"> if ($type eq "SerializedScriptValue") {
</span><span class="cx"> AddToImplIncludes("SerializedScriptValue.h", $conditional);
</span><span class="cx"> return "$value ? $value->deserialize($stateReference, $globalObject) : jsNull()";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLParserpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -103,8 +103,10 @@
</span><span class="cx"> # Used to represent Iterable interfaces
</span><span class="cx"> struct( domIterable => {
</span><span class="cx"> isKeyValue => '$',# Is map iterable or set iterable
</span><del>- keyType => '$', # Key type for map iterables
- valueType => '$', # Value type for map or set iterables
</del><ins>+ keyType => '$', # Key type name for map iterables (DEPRECATED - please use idlKeyType)
+ valueType => '$', # Value type name for map or set iterables (DEPRECATED - please use idlValueType)
+ idlKeyType => '$', # Key type for map iterables
+ idlValueType => '$', # Value type for map or set iterables
</ins><span class="cx"> functions => '@', # Iterable functions (entries, keys, values, [Symbol.Iterator], forEach)
</span><span class="cx"> extendedAttributes => '$', # Extended attributes
</span><span class="cx"> });
</span><span class="lines">@@ -1514,15 +1516,21 @@
</span><span class="cx"> push(@{$newDataNode->functions}, $forEachFunction);
</span><span class="cx">
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "<", __LINE__);
</span><del>- my $type1 = $self->getToken()->value();
</del><ins>+ my $type1 = $self->parseType();
+
</ins><span class="cx"> if ($self->nextToken()->value() eq ",") {
</span><span class="cx"> $self->assertTokenValue($self->getToken(), ",", __LINE__);
</span><ins>+
+ my $type2 = $self->parseType();
</ins><span class="cx"> $newDataNode->isKeyValue(1);
</span><del>- $newDataNode->keyType($type1);
- $newDataNode->valueType($self->getToken()->value());
</del><ins>+ $newDataNode->idlKeyType($type1);
+ $newDataNode->keyType($type1->name);
+ $newDataNode->idlValueType($type2);
+ $newDataNode->valueType($type2->name);
</ins><span class="cx"> } else {
</span><span class="cx"> $newDataNode->isKeyValue(0);
</span><del>- $newDataNode->valueType($type1);
</del><ins>+ $newDataNode->idlValueType($type1);
+ $newDataNode->valueType($type1->name);
</ins><span class="cx"> }
</span><span class="cx"> $self->assertTokenValue($self->getToken(), ">", __LINE__);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestIterablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIterable.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIterable.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestIterable.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -163,9 +163,15 @@
</span><span class="cx"> return getDOMConstructor<JSTestIterableConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-using TestIterableIterator = JSDOMIterator<JSTestIterable>;
-using TestIterableIteratorPrototype = JSDOMIteratorPrototype<JSTestIterable>;
</del><ins>+struct TestIterableIteratorTraits {
+ static constexpr JSDOMIteratorType type = JSDOMIteratorType::Set;
+ using KeyType = void;
+ using ValueType = IDLInterface<TestNode>;
+};
</ins><span class="cx">
</span><ins>+using TestIterableIterator = JSDOMIterator<JSTestIterable, TestIterableIteratorTraits>;
+using TestIterableIteratorPrototype = JSDOMIteratorPrototype<JSTestIterable, TestIterableIteratorTraits>;
+
</ins><span class="cx"> template<>
</span><span class="cx"> const JSC::ClassInfo TestIterableIterator::s_info = { "TestIterable Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(TestIterableIterator) };
</span><span class="cx">
</span><span class="lines">@@ -174,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestIterablePrototypeFunctionSymbolIteratorCaller(ExecState*, JSTestIterable* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestIterable>(*thisObject, IterationKind::Value));
</del><ins>+ return JSValue::encode(iteratorCreate<TestIterableIterator>(*thisObject, IterationKind::Value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestIterablePrototypeFunctionSymbolIterator(JSC::ExecState* state)
</span><span class="lines">@@ -184,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestIterablePrototypeFunctionEntriesCaller(ExecState*, JSTestIterable* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestIterable>(*thisObject, IterationKind::KeyValue));
</del><ins>+ return JSValue::encode(iteratorCreate<TestIterableIterator>(*thisObject, IterationKind::KeyValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestIterablePrototypeFunctionEntries(JSC::ExecState* state)
</span><span class="lines">@@ -194,7 +200,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestIterablePrototypeFunctionKeysCaller(ExecState*, JSTestIterable* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestIterable>(*thisObject, IterationKind::Key));
</del><ins>+ return JSValue::encode(iteratorCreate<TestIterableIterator>(*thisObject, IterationKind::Key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestIterablePrototypeFunctionKeys(JSC::ExecState* state)
</span><span class="lines">@@ -204,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestIterablePrototypeFunctionValuesCaller(ExecState*, JSTestIterable* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestIterable>(*thisObject, IterationKind::Value));
</del><ins>+ return JSValue::encode(iteratorCreate<TestIterableIterator>(*thisObject, IterationKind::Value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestIterablePrototypeFunctionValues(JSC::ExecState* state)
</span><span class="lines">@@ -214,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestIterablePrototypeFunctionForEachCaller(ExecState* state, JSTestIterable* thisObject, JSC::ThrowScope& throwScope)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorForEach<JSTestIterable>(*state, *thisObject, throwScope));
</del><ins>+ return JSValue::encode(iteratorForEach<TestIterableIterator>(*state, *thisObject, throwScope));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestIterablePrototypeFunctionForEach(JSC::ExecState* state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -264,9 +264,15 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-using TestNodeIterator = JSDOMIterator<JSTestNode>;
-using TestNodeIteratorPrototype = JSDOMIteratorPrototype<JSTestNode>;
</del><ins>+struct TestNodeIteratorTraits {
+ static constexpr JSDOMIteratorType type = JSDOMIteratorType::Set;
+ using KeyType = void;
+ using ValueType = IDLInterface<TestNode>;
+};
</ins><span class="cx">
</span><ins>+using TestNodeIterator = JSDOMIterator<JSTestNode, TestNodeIteratorTraits>;
+using TestNodeIteratorPrototype = JSDOMIteratorPrototype<JSTestNode, TestNodeIteratorTraits>;
+
</ins><span class="cx"> template<>
</span><span class="cx"> const JSC::ClassInfo TestNodeIterator::s_info = { "TestNode Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(TestNodeIterator) };
</span><span class="cx">
</span><span class="lines">@@ -275,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestNodePrototypeFunctionSymbolIteratorCaller(ExecState*, JSTestNode* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestNode>(*thisObject, IterationKind::Value));
</del><ins>+ return JSValue::encode(iteratorCreate<TestNodeIterator>(*thisObject, IterationKind::Value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestNodePrototypeFunctionSymbolIterator(JSC::ExecState* state)
</span><span class="lines">@@ -285,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestNodePrototypeFunctionEntriesCaller(ExecState*, JSTestNode* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestNode>(*thisObject, IterationKind::KeyValue));
</del><ins>+ return JSValue::encode(iteratorCreate<TestNodeIterator>(*thisObject, IterationKind::KeyValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestNodePrototypeFunctionEntries(JSC::ExecState* state)
</span><span class="lines">@@ -295,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestNodePrototypeFunctionKeysCaller(ExecState*, JSTestNode* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestNode>(*thisObject, IterationKind::Key));
</del><ins>+ return JSValue::encode(iteratorCreate<TestNodeIterator>(*thisObject, IterationKind::Key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestNodePrototypeFunctionKeys(JSC::ExecState* state)
</span><span class="lines">@@ -305,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestNodePrototypeFunctionValuesCaller(ExecState*, JSTestNode* thisObject, JSC::ThrowScope&)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorCreate<JSTestNode>(*thisObject, IterationKind::Value));
</del><ins>+ return JSValue::encode(iteratorCreate<TestNodeIterator>(*thisObject, IterationKind::Value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestNodePrototypeFunctionValues(JSC::ExecState* state)
</span><span class="lines">@@ -315,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> static inline EncodedJSValue jsTestNodePrototypeFunctionForEachCaller(ExecState* state, JSTestNode* thisObject, JSC::ThrowScope& throwScope)
</span><span class="cx"> {
</span><del>- return JSValue::encode(iteratorForEach<JSTestNode>(*state, *thisObject, throwScope));
</del><ins>+ return JSValue::encode(iteratorForEach<TestNodeIterator>(*state, *thisObject, throwScope));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestNodePrototypeFunctionForEach(JSC::ExecState* state)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (207828 => 207829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-25 18:00:59 UTC (rev 207828)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-25 18:35:03 UTC (rev 207829)
</span><span class="lines">@@ -3130,7 +3130,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = jsStringOrNull(&state, impl.nullableStringAttribute());
</del><ins>+ JSValue result = toJS<IDLNullable<IDLDOMString>>(state, impl.nullableStringAttribute());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3162,7 +3162,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = jsStringOrNull(&state, impl.nullableStringSettableAttribute());
</del><ins>+ JSValue result = toJS<IDLNullable<IDLDOMString>>(state, impl.nullableStringSettableAttribute());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3178,7 +3178,7 @@
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> auto& impl = thisObject.wrapped();
</span><del>- JSValue result = jsStringOrNull(&state, impl.nullableUSVStringSettableAttribute());
</del><ins>+ JSValue result = toJS<IDLNullable<IDLUSVString>>(state, impl.nullableUSVStringSettableAttribute());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5128,7 +5128,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = jsStringOrNull(state, impl.nullableStringMethod());
</del><ins>+ JSValue result = toJS<IDLNullable<IDLDOMString>>(*state, impl.nullableStringMethod());
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5137,7 +5137,7 @@
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><del>- JSValue result = jsStringOrNull(state, TestObj::nullableStringStaticMethod());
</del><ins>+ JSValue result = toJS<IDLNullable<IDLDOMString>>(*state, TestObj::nullableStringStaticMethod());
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5157,7 +5157,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto index = convert<IDLUnsignedLong>(*state, state->uncheckedArgument(0), NormalConversion);
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
</span><del>- JSValue result = jsStringOrNull(state, impl.nullableStringSpecialMethod(WTFMove(index)));
</del><ins>+ JSValue result = toJS<IDLNullable<IDLDOMString>>(*state, impl.nullableStringSpecialMethod(WTFMove(index)));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>