<!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>[204336] 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/204336">204336</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-08-10 10:32:15 -0700 (Wed, 10 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove support for array types in IDLs
https://bugs.webkit.org/show_bug.cgi?id=160729
Reviewed by Anders Carlsson.
Array types have been removed from WebIDL in favor of sequence<> and FrozenArray<>.
- Replace all current uses of Array types with sequences. This causes
no functional change.
* bindings/scripts/CodeGenerator.pm:
* bindings/scripts/CodeGeneratorGObject.pm:
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/IDLParser.pm:
Remove array support from the generators.
* Modules/gamepad/Gamepad.idl:
* Modules/gamepad/NavigatorGamepad.idl:
* Modules/gamepad/deprecated/Gamepad.idl:
* Modules/mediacontrols/MediaControlsHost.idl:
* Modules/mediastream/MediaStream.idl:
* Modules/mediastream/MediaTrackConstraints.idl:
* Modules/mediastream/RTCConfiguration.idl:
* Modules/mediastream/RTCIceServer.idl:
* Modules/mediastream/RTCTrackEvent.idl:
* crypto/CryptoKey.idl:
* dom/MessageEvent.idl:
* testing/Internals.idl:
Switch from array to sequence.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadidl">trunk/Source/WebCore/Modules/gamepad/Gamepad.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadidl">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepaddeprecatedGamepadidl">trunk/Source/WebCore/Modules/gamepad/deprecated/Gamepad.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamidl">trunk/Source/WebCore/Modules/mediastream/MediaStream.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsidl">trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationidl">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceServeridl">trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCTrackEventidl">trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</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="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestSerializedScriptValueInterfaceidl">trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestTypedefsidl">trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoKeyidl">trunk/Source/WebCore/crypto/CryptoKey.idl</a></li>
<li><a href="#trunkSourceWebCoredomMessageEventidl">trunk/Source/WebCore/dom/MessageEvent.idl</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/ChangeLog 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-08-09 Sam Weinig <sam@webkit.org>
+
+ Remove support for array types in IDLs
+ https://bugs.webkit.org/show_bug.cgi?id=160729
+
+ Reviewed by Anders Carlsson.
+
+ Array types have been removed from WebIDL in favor of sequence<> and FrozenArray<>.
+
+ - Replace all current uses of Array types with sequences. This causes
+ no functional change.
+
+ * bindings/scripts/CodeGenerator.pm:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/IDLParser.pm:
+ Remove array support from the generators.
+
+ * Modules/gamepad/Gamepad.idl:
+ * Modules/gamepad/NavigatorGamepad.idl:
+ * Modules/gamepad/deprecated/Gamepad.idl:
+ * Modules/mediacontrols/MediaControlsHost.idl:
+ * Modules/mediastream/MediaStream.idl:
+ * Modules/mediastream/MediaTrackConstraints.idl:
+ * Modules/mediastream/RTCConfiguration.idl:
+ * Modules/mediastream/RTCIceServer.idl:
+ * Modules/mediastream/RTCTrackEvent.idl:
+ * crypto/CryptoKey.idl:
+ * dom/MessageEvent.idl:
+ * testing/Internals.idl:
+ Switch from array to sequence.
+
</ins><span class="cx"> 2016-08-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use unsigned for locations in URL
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/Gamepad.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> readonly attribute boolean connected;
</span><span class="cx"> readonly attribute double timestamp;
</span><span class="cx"> readonly attribute DOMString mapping;
</span><del>- readonly attribute double[] axes;
- readonly attribute GamepadButton[] buttons;
</del><ins>+ readonly attribute sequence<double> axes;
+ readonly attribute sequence<GamepadButton> buttons;
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -26,6 +26,6 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=GAMEPAD,
</span><span class="cx"> ] partial interface Navigator {
</span><del>- [EnabledAtRuntime=Gamepads] Gamepad[] getGamepads();
</del><ins>+ [EnabledAtRuntime=Gamepads] sequence<Gamepad> getGamepads();
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepaddeprecatedGamepadidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/deprecated/Gamepad.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/deprecated/Gamepad.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/gamepad/deprecated/Gamepad.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> readonly attribute DOMString id;
</span><span class="cx"> readonly attribute unsigned long index;
</span><span class="cx"> readonly attribute unsigned long long timestamp;
</span><del>- readonly attribute unrestricted float[] axes;
- readonly attribute unrestricted float[] buttons;
</del><ins>+ readonly attribute sequence<unrestricted float> axes;
+ readonly attribute sequence<unrestricted float> buttons;
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface MediaControlsHost {
</span><del>- TextTrack[] sortedTrackListForMenu(TextTrackList? trackList);
- AudioTrack[] sortedTrackListForMenu(AudioTrackList? trackList);
</del><ins>+ sequence<TextTrack> sortedTrackListForMenu(TextTrackList? trackList);
+ sequence<AudioTrack> sortedTrackListForMenu(AudioTrackList? trackList);
</ins><span class="cx"> DOMString displayNameForTrack(TextTrack? track);
</span><span class="cx"> DOMString displayNameForTrack(AudioTrack? track);
</span><span class="cx"> readonly attribute TextTrack captionMenuOffItem;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><span class="cx"> Constructor,
</span><span class="cx"> Constructor(MediaStream stream),
</span><del>- Constructor(MediaStreamTrack[] tracks),
</del><ins>+ Constructor(sequence<MediaStreamTrack> tracks),
</ins><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> PrivateIdentifier,
</span><span class="cx"> PublicIdentifier
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -28,6 +28,6 @@
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface MediaTrackConstraints {
</span><span class="cx"> readonly attribute MediaTrackConstraintSet? mandatory;
</span><del>- readonly attribute MediaTrackConstraint[]? optional;
</del><ins>+ readonly attribute sequence<MediaTrackConstraint>? optional;
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface RTCConfiguration {
</span><del>- readonly attribute RTCIceServer[] iceServers;
</del><ins>+ readonly attribute sequence<RTCIceServer> iceServers;
</ins><span class="cx"> readonly attribute RTCIceTransportPolicy iceTransportPolicy;
</span><span class="cx"> readonly attribute RTCBundlePolicy bundlePolicy;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceServeridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceServer.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface RTCIceServer {
</span><del>- readonly attribute DOMString[] urls;
</del><ins>+ readonly attribute sequence<DOMString> urls;
</ins><span class="cx"> readonly attribute DOMString username;
</span><span class="cx"> readonly attribute DOMString credential;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCTrackEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -34,6 +34,6 @@
</span><span class="cx"> ] interface RTCTrackEvent : Event {
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute RTCRtpReceiver receiver;
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute MediaStreamTrack track;
</span><del>- [InitializedByEventConstructor] readonly attribute MediaStream[] streams;
</del><ins>+ [InitializedByEventConstructor] readonly attribute sequence<MediaStream> streams;
</ins><span class="cx"> [InitializedByEventConstructor] readonly attribute RTCRtpTransceiver transceiver;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> return 0 if $object->IsPrimitiveType($type);
</span><span class="cx"> return 0 if $object->IsDictionaryType($type);
</span><span class="cx"> return 0 if $object->IsEnumType($type);
</span><del>- return 0 if $object->GetArrayOrSequenceType($type);
</del><ins>+ return 0 if $object->GetSequenceType($type);
</ins><span class="cx"> return 0 if $type eq "DOMString" or $type eq "USVString";
</span><span class="cx"> return 0 if $type eq "any";
</span><span class="cx">
</span><span class="lines">@@ -526,30 +526,6 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetArrayType
-{
- my $object = shift;
- my $type = shift;
-
- return $1 if $type =~ /^([\w\d_\s]+)\[\]/;
- return "";
-}
-
-sub GetArrayOrSequenceType
-{
- my $object = shift;
- my $type = shift;
-
- return $object->GetArrayType($type) || $object->GetSequenceType($type);
-}
-
-sub AssertNotSequenceType
-{
- my $object = shift;
- my $type = shift;
- die "Sequences must not be used as the type of an attribute, constant or exception field." if $object->GetSequenceType($type);
-}
-
</del><span class="cx"> # These match WK_lcfirst and WK_ucfirst defined in builtins_generator.py.
</span><span class="cx"> # Uppercase the first letter while respecting WebKit style guidelines.
</span><span class="cx"> # E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -244,13 +244,8 @@
</span><span class="cx">
</span><span class="cx"> return 1 if $attribute->isStatic;
</span><span class="cx"> return 1 if $codeGenerator->IsTypedArrayType($propType);
</span><ins>+ return 1 if $codeGenerator->GetSequenceType($propType);
</ins><span class="cx">
</span><del>- $codeGenerator->AssertNotSequenceType($propType);
-
- if ($codeGenerator->GetArrayType($propType)) {
- return 1;
- }
-
</del><span class="cx"> if ($codeGenerator->IsEnumType($propType)) {
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -338,7 +333,7 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsTypedArrayType($function->signature->type) || $codeGenerator->GetArrayType($function->signature->type)) {
</del><ins>+ if ($codeGenerator->IsTypedArrayType($function->signature->type)) {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1102,8 +1097,8 @@
</span><span class="cx"> my @callImplParams;
</span><span class="cx"> foreach my $param (@{$function->parameters}) {
</span><span class="cx"> my $paramIDLType = $param->type;
</span><del>- my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($paramIDLType);
- $paramIDLType = $arrayOrSequenceType if $arrayOrSequenceType ne "";
</del><ins>+ my $sequenceType = $codeGenerator->GetSequenceType($paramIDLType);
+ $paramIDLType = $sequenceType if $sequenceType ne "";
</ins><span class="cx"> my $paramType = GetGlibTypeName($paramIDLType);
</span><span class="cx"> my $const = $paramType eq "gchar*" ? "const " : "";
</span><span class="cx"> my $paramName = $param->name;
</span><span class="lines">@@ -1174,8 +1169,8 @@
</span><span class="cx"> last;
</span><span class="cx"> }
</span><span class="cx"> my $paramIDLType = $param->type;
</span><del>- my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($paramIDLType);
- $paramIDLType = $arrayOrSequenceType if $arrayOrSequenceType ne "";
</del><ins>+ my $sequenceType = $codeGenerator->GetSequenceType($paramIDLType);
+ $paramIDLType = $sequenceType if $sequenceType ne "";
</ins><span class="cx"> my $paramType = GetGlibTypeName($paramIDLType);
</span><span class="cx"> # $paramType can have a trailing * in some cases
</span><span class="cx"> $paramType =~ s/\*$//;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -202,15 +202,11 @@
</span><span class="cx"> # When we're finished with the one-file-per-class reorganization, we won't need these special cases.
</span><span class="cx"> if ($isCallback && $codeGenerator->IsWrapperType($type)) {
</span><span class="cx"> $includesRef->{"JS${type}.h"} = 1;
</span><del>- } elsif ($codeGenerator->GetArrayOrSequenceType($type)) {
- my $arrayType = $codeGenerator->GetArrayType($type);
- my $arrayOrSequenceType = $arrayType || $codeGenerator->GetSequenceType($type);
- if ($arrayType eq "DOMString") {
- $includesRef->{"JSDOMStringList.h"} = 1;
- $includesRef->{"DOMStringList.h"} = 1;
- } elsif ($codeGenerator->IsRefPtrType($arrayOrSequenceType)) {
- $includesRef->{"JS${arrayOrSequenceType}.h"} = 1;
- $includesRef->{"${arrayOrSequenceType}.h"} = 1;
</del><ins>+ } elsif ($codeGenerator->GetSequenceType($type)) {
+ my $sequenceType = $codeGenerator->GetSequenceType($type);
+ if ($codeGenerator->IsRefPtrType($sequenceType)) {
+ $includesRef->{"JS${sequenceType}.h"} = 1;
+ $includesRef->{"${sequenceType}.h"} = 1;
</ins><span class="cx"> }
</span><span class="cx"> $includesRef->{"<runtime/JSArray.h>"} = 1;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1757,7 +1753,7 @@
</span><span class="cx"> return 0 if &$isDictionary($typeA) && &$isDictionary($typeB);
</span><span class="cx"> return 0 if $codeGenerator->IsCallbackInterface($typeA) && $codeGenerator->IsCallbackInterface($typeB);
</span><span class="cx"> return 0 if &$isCallbackFunctionOrDictionary($typeA) && &$isCallbackFunctionOrDictionary($typeB);
</span><del>- return 0 if $codeGenerator->GetArrayOrSequenceType($typeA) && $codeGenerator->GetArrayOrSequenceType($typeB);
</del><ins>+ return 0 if $codeGenerator->GetSequenceType($typeA) && $codeGenerator->GetSequenceType($typeB);
</ins><span class="cx"> # FIXME: return 0 if typeA and typeB are both exception types.
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -1846,9 +1842,9 @@
</span><span class="cx"> my ($type, $optionality, $isNullable) = @_;
</span><span class="cx"> return $type eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($type);
</span><span class="cx"> };
</span><del>- my $isArrayOrSequenceParameter = sub {
</del><ins>+ my $isSequenceParameter = sub {
</ins><span class="cx"> my ($type, $optionality, $isNullable) = @_;
</span><del>- return $codeGenerator->GetArrayOrSequenceType($type);
</del><ins>+ return $codeGenerator->GetSequenceType($type);
</ins><span class="cx"> };
</span><span class="cx"> my $isDictionaryOrObjectOrCallbackInterfaceParameter = sub {
</span><span class="cx"> my ($type, $optionality, $isNullable) = @_;
</span><span class="lines">@@ -1921,7 +1917,7 @@
</span><span class="cx"> $overload = GetOverloadThatMatches($S, $d, \&$isObjectOrCallbackFunctionParameter);
</span><span class="cx"> &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isFunction()");
</span><span class="cx">
</span><del>- $overload = GetOverloadThatMatches($S, $d, \&$isArrayOrSequenceParameter);
</del><ins>+ $overload = GetOverloadThatMatches($S, $d, \&$isSequenceParameter);
</ins><span class="cx"> &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && isJSArray(distinguishingArg)");
</span><span class="cx">
</span><span class="cx"> $overload = GetOverloadThatMatches($S, $d, \&$isDictionaryOrObjectOrCallbackInterfaceParameter);
</span><span class="lines">@@ -2733,7 +2729,6 @@
</span><span class="cx">
</span><span class="cx"> my $name = $attribute->signature->name;
</span><span class="cx"> my $type = $attribute->signature->type;
</span><del>- $codeGenerator->AssertNotSequenceType($type);
</del><span class="cx"> my $getFunctionName = GetAttributeGetterName($interface, $className, $attribute);
</span><span class="cx"> my $implGetterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->extendedAttributes->{"ImplementedAs"} || $name);
</span><span class="cx"> my $getterExceptionsWithMessage = $attribute->signature->extendedAttributes->{"GetterRaisesExceptionWithMessage"};
</span><span class="lines">@@ -3776,7 +3771,7 @@
</span><span class="cx"> return 1 if defined $automaticallyGeneratedDefaultValue && $automaticallyGeneratedDefaultValue eq $defaultValue;
</span><span class="cx">
</span><span class="cx"> # toRefPtrNativeArray() will convert undefined to an empty Vector.
</span><del>- return 1 if $defaultValue eq "[]" && $codeGenerator->GetArrayOrSequenceType($parameterType);
</del><ins>+ return 1 if $defaultValue eq "[]" && $codeGenerator->GetSequenceType($parameterType);
</ins><span class="cx">
</span><span class="cx"> return 1 if $defaultValue eq "null" && $codeGenerator->IsWrapperType($parameterType);
</span><span class="cx">
</span><span class="lines">@@ -4523,8 +4518,8 @@
</span><span class="cx">
</span><span class="cx"> return "RefPtr<${type}>" if $codeGenerator->IsTypedArrayType($type) and $type ne "ArrayBuffer";
</span><span class="cx">
</span><del>- my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($type);
- return "Vector<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">" if $arrayOrSequenceType;
</del><ins>+ my $sequenceType = $codeGenerator->GetSequenceType($type);
+ return "Vector<" . GetNativeVectorInnerType($sequenceType) . ">" if $sequenceType;
</ins><span class="cx">
</span><span class="cx"> return "${type}*";
</span><span class="cx"> }
</span><span class="lines">@@ -4540,10 +4535,10 @@
</span><span class="cx">
</span><span class="cx"> sub GetNativeVectorInnerType
</span><span class="cx"> {
</span><del>- my $arrayOrSequenceType = shift;
</del><ins>+ my $sequenceType = shift;
</ins><span class="cx">
</span><del>- return $nativeType{$arrayOrSequenceType} if exists $nativeType{$arrayOrSequenceType};
- return "RefPtr<${arrayOrSequenceType}>";
</del><ins>+ return $nativeType{$sequenceType} if exists $nativeType{$sequenceType};
+ return "RefPtr<${sequenceType}>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetNativeTypeForCallbacks
</span><span class="lines">@@ -4655,13 +4650,13 @@
</span><span class="cx"> return ("Dictionary(state, $value)", 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($type);
- if ($arrayOrSequenceType) {
- if ($codeGenerator->IsRefPtrType($arrayOrSequenceType)) {
- AddToImplIncludes("JS${arrayOrSequenceType}.h");
- return ("(toRefPtrNativeArray<${arrayOrSequenceType}, JS${arrayOrSequenceType}>(state, $value, &JS${arrayOrSequenceType}::toWrapped))", 1);
</del><ins>+ my $sequenceType = $codeGenerator->GetSequenceType($type);
+ if ($sequenceType) {
+ if ($codeGenerator->IsRefPtrType($sequenceType)) {
+ AddToImplIncludes("JS${sequenceType}.h");
+ return ("(toRefPtrNativeArray<${sequenceType}, JS${sequenceType}>(state, $value, &JS${sequenceType}::toWrapped))", 1);
</ins><span class="cx"> }
</span><del>- return ("toNativeArray<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">(*state, $value)", 1);
</del><ins>+ return ("toNativeArray<" . GetNativeVectorInnerType($sequenceType) . ">(*state, $value)", 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return ($value, 0) if $type eq "any";
</span><span class="lines">@@ -4732,14 +4727,10 @@
</span><span class="cx"> return "jsStringWithCache(state, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $arrayType = $codeGenerator->GetArrayType($type);
- my $arrayOrSequenceType = $arrayType || $codeGenerator->GetSequenceType($type);
-
- if ($arrayOrSequenceType) {
- if ($arrayType eq "DOMString") {
- AddToImplIncludes("JSDOMStringList.h", $conditional);
- } elsif ($codeGenerator->IsRefPtrType($arrayOrSequenceType)) {
- AddToImplIncludes("JS${arrayOrSequenceType}.h", $conditional);
</del><ins>+ my $sequenceType = $codeGenerator->GetSequenceType($type);
+ if ($sequenceType) {
+ if ($codeGenerator->IsRefPtrType($sequenceType)) {
+ AddToImplIncludes("JS${sequenceType}.h", $conditional);
</ins><span class="cx"> }
</span><span class="cx"> AddToImplIncludes("<runtime/JSArray.h>", $conditional);
</span><span class="cx"> return "jsArray(state, $globalObject, $value)";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLParserpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -1537,7 +1537,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $paramDataNode->isNullable(0);
</span><span class="cx"> }
</span><del>- # Remove all "?" if exists, e.g. "object?[]?" -> "object[]".
</del><ins>+ # Remove "?" if exists, e.g. "object?" -> "object".
</ins><span class="cx"> $paramDataNode->type(identifierRemoveNullablePrefix(typeRemoveNullableSuffix($type)));
</span><span class="cx"> $paramDataNode->isOptional(1);
</span><span class="cx"> $paramDataNode->name($self->parseArgumentName());
</span><span class="lines">@@ -1552,7 +1552,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $paramDataNode->isNullable(0);
</span><span class="cx"> }
</span><del>- # Remove all "?" if exists, e.g. "object?[]?" -> "object[]".
</del><ins>+ # Remove "?" if exists, e.g. "object?" -> "object".
</ins><span class="cx"> $paramDataNode->type(typeRemoveNullableSuffix($type));
</span><span class="cx"> $paramDataNode->isOptional(0);
</span><span class="cx"> $paramDataNode->isVariadic($self->parseEllipsis());
</span><span class="lines">@@ -1904,7 +1904,7 @@
</span><span class="cx"> my $next = $self->nextToken();
</span><span class="cx"> if ($next->value() eq "any") {
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "any", __LINE__);
</span><del>- return "any" . $self->parseTypeSuffixStartingWithArray();
</del><ins>+ return "any";
</ins><span class="cx"> }
</span><span class="cx"> if ($next->type() == IdentifierToken || $next->value() =~ /$nextSingleType_1/) {
</span><span class="cx"> return $self->parseNonAnyType();
</span><span class="lines">@@ -2123,30 +2123,13 @@
</span><span class="cx"> {
</span><span class="cx"> my $self = shift;
</span><span class="cx"> my $next = $self->nextToken();
</span><del>- if ($next->value() eq "[") {
- $self->assertTokenValue($self->getToken(), "[", __LINE__);
- $self->assertTokenValue($self->getToken(), "]", __LINE__);
- return "[]" . $self->parseTypeSuffix();
- }
</del><span class="cx"> if ($next->value() eq "?") {
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "?", __LINE__);
</span><del>- return "?" . $self->parseTypeSuffixStartingWithArray();
</del><ins>+ return "?";
</ins><span class="cx"> }
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub parseTypeSuffixStartingWithArray
-{
- my $self = shift;
- my $next = $self->nextToken();
- if ($next->value() eq "[") {
- $self->assertTokenValue($self->getToken(), "[", __LINE__);
- $self->assertTokenValue($self->getToken(), "]", __LINE__);
- return "[]" . $self->parseTypeSuffix();
- }
- return "";
-}
-
</del><span class="cx"> sub parseNull
</span><span class="cx"> {
</span><span class="cx"> my $self = shift;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -1755,26 +1755,6 @@
</span><span class="cx"> item->methodWithOptionalUnsignedLongLongIsZero(number);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_obj_method_with_optional_array(WebKitDOMTestObj* self, const gchar* array)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- g_return_if_fail(WEBKIT_DOM_IS_DOM_STRING[](array));
- WebCore::TestObj* item = WebKit::core(self);
- WebCore::DOMString[]* convertedArray = WebKit::core(array);
- item->methodWithOptionalArray(convertedArray);
-}
-
-void webkit_dom_test_obj_method_with_optional_array_is_empty(WebKitDOMTestObj* self, const gchar* array)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- g_return_if_fail(WEBKIT_DOM_IS_DOM_STRING[](array));
- WebCore::TestObj* item = WebKit::core(self);
- WebCore::DOMString[]* convertedArray = WebKit::core(array);
- item->methodWithOptionalArrayIsEmpty(convertedArray);
-}
-
</del><span class="cx"> void webkit_dom_test_obj_method_with_optional_boolean(WebKitDOMTestObj* self, gboolean b)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -709,26 +709,6 @@
</span><span class="cx"> webkit_dom_test_obj_method_with_optional_unsigned_long_long_is_zero(WebKitDOMTestObj* self, guint64 number);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_obj_method_with_optional_array:
- * @self: A #WebKitDOMTestObj
- * @array: A #gchar
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_obj_method_with_optional_array(WebKitDOMTestObj* self, const gchar* array);
-
-/**
- * webkit_dom_test_obj_method_with_optional_array_is_empty:
- * @self: A #WebKitDOMTestObj
- * @array: A #gchar
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_obj_method_with_optional_array_is_empty(WebKitDOMTestObj* self, const gchar* array);
-
-/**
</del><span class="cx"> * webkit_dom_test_obj_method_with_optional_boolean:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><span class="cx"> * @b: A #gboolean
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -232,16 +232,6 @@
</span><span class="cx"> new (priv) WebKitDOMTestTypedefsPrivate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, glong x)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
- g_return_if_fail(WEBKIT_DOM_IS_LONG[](x));
- WebCore::TestTypedefs* item = WebKit::core(self);
- WebCore::long[]* convertedX = WebKit::core(x);
- item->func(x);
-}
-
</del><span class="cx"> void webkit_dom_test_typedefs_set_shadow(WebKitDOMTestTypedefs* self, gfloat width, gfloat height, gfloat blur, const gchar* color, gfloat alpha)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -252,16 +242,6 @@
</span><span class="cx"> item->setShadow(width, height, blur, convertedColor, alpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, const gchar* arrayArg)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
- g_return_if_fail(WEBKIT_DOM_IS_DOM_STRING[](arrayArg));
- WebCore::TestTypedefs* item = WebKit::core(self);
- WebCore::DOMString[]* convertedArrayArg = WebKit::core(arrayArg);
- item->nullableArrayArg(convertedArrayArg);
-}
-
</del><span class="cx"> WebKitDOMSVGPoint* webkit_dom_test_typedefs_immutable_point_function(WebKitDOMTestTypedefs* self)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -48,16 +48,6 @@
</span><span class="cx"> webkit_dom_test_typedefs_get_type(void);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_typedefs_func:
- * @self: A #WebKitDOMTestTypedefs
- * @x: A #glong
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, glong x);
-
-/**
</del><span class="cx"> * webkit_dom_test_typedefs_set_shadow:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><span class="cx"> * @width: A #gfloat
</span><span class="lines">@@ -72,16 +62,6 @@
</span><span class="cx"> webkit_dom_test_typedefs_set_shadow(WebKitDOMTestTypedefs* self, gfloat width, gfloat height, gfloat blur, const gchar* color, gfloat alpha);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_typedefs_nullable_array_arg:
- * @self: A #WebKitDOMTestTypedefs
- * @arrayArg: A #gchar
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, const gchar* arrayArg);
-
-/**
</del><span class="cx"> * webkit_dom_test_typedefs_immutable_point_function:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -652,13 +652,12 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequence(JSC::ExecState*);
</del><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalLongLong(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalLongLongIsZero(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLong(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongIsZero(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArray(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArrayIsEmpty(JSC::ExecState*);
</del><ins>+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequence(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequenceIsEmpty(JSC::ExecState*);
</ins><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalBoolean(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalBooleanIsFalse(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAny(JSC::ExecState*);
</span><span class="lines">@@ -696,7 +695,6 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStringArrayFunction(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionDomStringListFunction(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence2(JSC::ExecState*);
</del><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetElementById(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(JSC::ExecState*);
</span><span class="lines">@@ -1245,13 +1243,12 @@
</span><span class="cx"> { "methodWithOptionalAtomicStringIsEmptyString", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalDoubleIsNaN", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalFloatIsNaN", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN), (intptr_t) (0) } },
</span><del>- { "methodWithOptionalSequence", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalSequence), (intptr_t) (0) } },
</del><span class="cx"> { "methodWithOptionalLongLong", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalLongLong), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalLongLongIsZero", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalLongLongIsZero), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalUnsignedLongLong", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLong), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalUnsignedLongLongIsZero", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongIsZero), (intptr_t) (0) } },
</span><del>- { "methodWithOptionalArray", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalArray), (intptr_t) (0) } },
- { "methodWithOptionalArrayIsEmpty", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalArrayIsEmpty), (intptr_t) (0) } },
</del><ins>+ { "methodWithOptionalSequence", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalSequence), (intptr_t) (0) } },
+ { "methodWithOptionalSequenceIsEmpty", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalSequenceIsEmpty), (intptr_t) (0) } },
</ins><span class="cx"> { "methodWithOptionalBoolean", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalBoolean), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalBooleanIsFalse", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalBooleanIsFalse), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalAny", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAny), (intptr_t) (0) } },
</span><span class="lines">@@ -1287,7 +1284,6 @@
</span><span class="cx"> { "stringArrayFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionStringArrayFunction), (intptr_t) (1) } },
</span><span class="cx"> { "domStringListFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionDomStringListFunction), (intptr_t) (1) } },
</span><span class="cx"> { "methodWithAndWithoutNullableSequence", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence), (intptr_t) (2) } },
</span><del>- { "methodWithAndWithoutNullableSequence2", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence2), (intptr_t) (2) } },
</del><span class="cx"> { "getElementById", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionGetElementById), (intptr_t) (1) } },
</span><span class="cx"> { "getSVGDocument", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionGetSVGDocument), (intptr_t) (0) } },
</span><span class="cx"> { "convert1", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionConvert1), (intptr_t) (1) } },
</span><span class="lines">@@ -5090,21 +5086,6 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequence(ExecState* state)
-{
- JSValue thisValue = state->thisValue();
- auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
- if (UNLIKELY(!castedThis))
- return throwThisTypeError(*state, "TestObject", "methodWithOptionalSequence");
- ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
- auto& impl = castedThis->wrapped();
- auto sequence = toNativeArray<String>(*state, state->argument(0));
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- impl.methodWithOptionalSequence(WTFMove(sequence));
- return JSValue::encode(jsUndefined());
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalLongLong(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="lines">@@ -5165,33 +5146,33 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArray(ExecState* state)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequence(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="cx"> auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><del>- return throwThisTypeError(*state, "TestObject", "methodWithOptionalArray");
</del><ins>+ return throwThisTypeError(*state, "TestObject", "methodWithOptionalSequence");
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto array = state->argument(0).isUndefined() ? Optional<Vector<String>>() : toNativeArray<String>(*state, state->uncheckedArgument(0));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.methodWithOptionalArray(WTFMove(array));
</del><ins>+ impl.methodWithOptionalSequence(WTFMove(array));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArrayIsEmpty(ExecState* state)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSequenceIsEmpty(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="cx"> auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><del>- return throwThisTypeError(*state, "TestObject", "methodWithOptionalArrayIsEmpty");
</del><ins>+ return throwThisTypeError(*state, "TestObject", "methodWithOptionalSequenceIsEmpty");
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto array = toNativeArray<String>(*state, state->argument(0));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.methodWithOptionalArrayIsEmpty(WTFMove(array));
</del><ins>+ impl.methodWithOptionalSequenceIsEmpty(WTFMove(array));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5991,26 +5972,6 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence2(ExecState* state)
-{
- JSValue thisValue = state->thisValue();
- auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
- if (UNLIKELY(!castedThis))
- return throwThisTypeError(*state, "TestObject", "methodWithAndWithoutNullableSequence2");
- ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
- auto& impl = castedThis->wrapped();
- if (UNLIKELY(state->argumentCount() < 2))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- auto arrayArg = toNativeArray<uint32_t>(*state, state->argument(0));
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- auto nullableArrayArg = toNativeArray<uint32_t>(*state, state->argument(1));
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- impl.methodWithAndWithoutNullableSequence2(WTFMove(arrayArg), WTFMove(nullableArrayArg));
- return JSValue::encode(jsUndefined());
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetElementById(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -21,12 +21,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSTestTypedefs.h"
</span><span class="cx">
</span><del>-#include "DOMStringList.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSDOMConvert.h"
</span><del>-#include "JSDOMStringList.h"
</del><span class="cx"> #include "JSSVGPoint.h"
</span><span class="cx"> #include "JSSerializedScriptValue.h"
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="lines">@@ -50,11 +48,11 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithSequenceArg(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableArrayArg(JSC::ExecState*);
</del><ins>+JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableSequenceArg(JSC::ExecState*);
</ins><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFuncWithClamp(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionImmutablePointFunction(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction2(JSC::ExecState*);
</del><ins>+JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringSequenceFunction(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringSequenceFunction2(JSC::ExecState*);
</ins><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithException(JSC::ExecState*);
</span><span class="cx">
</span><span class="lines">@@ -169,11 +167,11 @@
</span><span class="cx"> { "func", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionFunc), (intptr_t) (0) } },
</span><span class="cx"> { "setShadow", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionSetShadow), (intptr_t) (3) } },
</span><span class="cx"> { "methodWithSequenceArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMethodWithSequenceArg), (intptr_t) (1) } },
</span><del>- { "nullableArrayArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionNullableArrayArg), (intptr_t) (1) } },
</del><ins>+ { "nullableSequenceArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionNullableSequenceArg), (intptr_t) (1) } },
</ins><span class="cx"> { "funcWithClamp", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionFuncWithClamp), (intptr_t) (1) } },
</span><span class="cx"> { "immutablePointFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionImmutablePointFunction), (intptr_t) (0) } },
</span><del>- { "stringArrayFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionStringArrayFunction), (intptr_t) (1) } },
- { "stringArrayFunction2", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionStringArrayFunction2), (intptr_t) (1) } },
</del><ins>+ { "stringSequenceFunction", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionStringSequenceFunction), (intptr_t) (1) } },
+ { "stringSequenceFunction2", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionStringSequenceFunction2), (intptr_t) (1) } },
</ins><span class="cx"> { "callWithSequenceThatRequiresInclude", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude), (intptr_t) (1) } },
</span><span class="cx"> { "methodWithException", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestTypedefsPrototypeFunctionMethodWithException), (intptr_t) (0) } },
</span><span class="cx"> };
</span><span class="lines">@@ -508,20 +506,20 @@
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableArrayArg(ExecState* state)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableSequenceArg(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="cx"> auto castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><del>- return throwThisTypeError(*state, "TestTypedefs", "nullableArrayArg");
</del><ins>+ return throwThisTypeError(*state, "TestTypedefs", "nullableSequenceArg");
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- auto arrayArg = toNativeArray<String>(*state, state->argument(0));
</del><ins>+ auto sequenceArg = toNativeArray<String>(*state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- impl.nullableArrayArg(WTFMove(arrayArg));
</del><ins>+ impl.nullableSequenceArg(WTFMove(sequenceArg));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,12 +555,12 @@
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction(ExecState* state)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringSequenceFunction(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="cx"> auto castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><del>- return throwThisTypeError(*state, "TestTypedefs", "stringArrayFunction");
</del><ins>+ return throwThisTypeError(*state, "TestTypedefs", "stringSequenceFunction");
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="lines">@@ -571,18 +569,18 @@
</span><span class="cx"> auto values = toNativeArray<String>(*state, state->argument(0));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- JSValue result = jsArray(state, castedThis->globalObject(), impl.stringArrayFunction(WTFMove(values), ec));
</del><ins>+ JSValue result = jsArray(state, castedThis->globalObject(), impl.stringSequenceFunction(WTFMove(values), ec));
</ins><span class="cx">
</span><span class="cx"> setDOMException(state, ec);
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction2(ExecState* state)
</del><ins>+EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringSequenceFunction2(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span><span class="cx"> auto castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><del>- return throwThisTypeError(*state, "TestTypedefs", "stringArrayFunction2");
</del><ins>+ return throwThisTypeError(*state, "TestTypedefs", "stringSequenceFunction2");
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="lines">@@ -591,7 +589,7 @@
</span><span class="cx"> auto values = toNativeArray<String>(*state, state->argument(0));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- JSValue result = jsArray(state, castedThis->globalObject(), impl.stringArrayFunction2(WTFMove(values), ec));
</del><ins>+ JSValue result = jsArray(state, castedThis->globalObject(), impl.stringSequenceFunction2(WTFMove(values), ec));
</ins><span class="cx">
</span><span class="cx"> setDOMException(state, ec);
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -220,13 +220,12 @@
</span><span class="cx"> void methodWithOptionalAtomicStringIsEmptyString([AtomicString] optional DOMString str = "");
</span><span class="cx"> void methodWithOptionalDoubleIsNaN(optional unrestricted double number = NaN);
</span><span class="cx"> void methodWithOptionalFloatIsNaN(optional unrestricted float number = NaN);
</span><del>- void methodWithOptionalSequence(optional sequence<DOMString> sequence = []);
</del><span class="cx"> void methodWithOptionalLongLong(optional long long number);
</span><span class="cx"> void methodWithOptionalLongLongIsZero(optional long long number = 0);
</span><span class="cx"> void methodWithOptionalUnsignedLongLong(optional unsigned long long number);
</span><span class="cx"> void methodWithOptionalUnsignedLongLongIsZero(optional unsigned long long number = 0);
</span><del>- void methodWithOptionalArray(optional DOMString[] array);
- void methodWithOptionalArrayIsEmpty(optional DOMString[] array = []);
</del><ins>+ void methodWithOptionalSequence(optional sequence<DOMString> array);
+ void methodWithOptionalSequenceIsEmpty(optional sequence<DOMString> array = []);
</ins><span class="cx"> void methodWithOptionalBoolean(optional boolean b);
</span><span class="cx"> void methodWithOptionalBooleanIsFalse(optional boolean b = false);
</span><span class="cx"> void methodWithOptionalAny(optional any a);
</span><span class="lines">@@ -281,9 +280,9 @@
</span><span class="cx"> void overloadedMethod(long longArg);
</span><span class="cx"> void overloadedMethod(TestCallback callback);
</span><span class="cx"> void overloadedMethod(DOMStringList? listArg);
</span><del>- void overloadedMethod(DOMString[]? arrayArg);
</del><ins>+ void overloadedMethod(sequence<DOMString>? arrayArg);
</ins><span class="cx"> void overloadedMethod(TestObj objArg);
</span><del>- void overloadedMethod(DOMString[] arrayArg);
</del><ins>+ void overloadedMethod(sequence<DOMString> arrayArg);
</ins><span class="cx"> void overloadedMethod(sequence<unsigned long> arrayArg);
</span><span class="cx"> void overloadedMethod(DOMString strArg);
</span><span class="cx">
</span><span class="lines">@@ -308,11 +307,10 @@
</span><span class="cx">
</span><span class="cx"> #if defined(TESTING_JS)
</span><span class="cx"> void methodWithUnsignedLongSequence(sequence<unsigned long> unsignedLongSequence);
</span><del>- [RaisesException] DOMString[] stringArrayFunction(DOMString[] values);
</del><ins>+ [RaisesException] sequence<DOMString> stringArrayFunction(sequence<DOMString> values);
</ins><span class="cx"> [RaisesException] DOMStringList domStringListFunction(DOMStringList values);
</span><span class="cx">
</span><span class="cx"> void methodWithAndWithoutNullableSequence(sequence<unsigned long> arrayArg, sequence<unsigned long>? nullableArrayArg);
</span><del>- void methodWithAndWithoutNullableSequence2(unsigned long[] arrayArg, unsigned long[]? nullableArrayArg);
</del><span class="cx">
</span><span class="cx"> Element? getElementById([RequiresExistingAtomicString] DOMString elementId);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestSerializedScriptValueInterfaceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -31,6 +31,6 @@
</span><span class="cx"> attribute SerializedScriptValue value;
</span><span class="cx"> readonly attribute SerializedScriptValue readonlyValue;
</span><span class="cx"> [CachedAttribute] attribute SerializedScriptValue cachedValue;
</span><del>- readonly attribute MessagePort[] ports;
</del><ins>+ readonly attribute sequence<MessagePort> ports;
</ins><span class="cx"> [CachedAttribute] readonly attribute SerializedScriptValue cachedReadonlyValue;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestTypedefsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/bindings/scripts/test/TestTypedefs.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -40,20 +40,20 @@
</span><span class="cx">
</span><span class="cx"> static readonly attribute T TestSubObj;
</span><span class="cx">
</span><del>- void func(optional ARRAY_OF_LONGS x = []);
</del><ins>+ void func(optional SEQUENCE_OF_LONGS x = []);
</ins><span class="cx">
</span><span class="cx"> void setShadow(DOUBLE width, DOUBLE height, unrestricted float blur, optional STRING color, optional DOUBLE alpha);
</span><span class="cx">
</span><span class="cx"> ULONGLONG methodWithSequenceArg(sequence<SCRIPT_VALUE> sequenceArg);
</span><span class="cx">
</span><del>- void nullableArrayArg(ARRAY_OF_STRINGS? arrayArg);
</del><ins>+ void nullableSequenceArg(SEQUENCE_OF_STRINGS? sequenceArg);
</ins><span class="cx">
</span><span class="cx"> void funcWithClamp(ULONGLONG_CLAMP arg1, optional ULONGLONG_CLAMP arg2);
</span><span class="cx">
</span><span class="cx"> [Immutable] SVGPOINT immutablePointFunction();
</span><span class="cx">
</span><del>- [RaisesException] ARRAY_OF_STRINGS stringArrayFunction(ARRAY_OF_STRINGS values);
- [RaisesException] STRING[] stringArrayFunction2(STRING[] values);
</del><ins>+ [RaisesException] SEQUENCE_OF_STRINGS stringSequenceFunction(SEQUENCE_OF_STRINGS values);
+ [RaisesException] sequence<STRING> stringSequenceFunction2(sequence<STRING> values);
</ins><span class="cx">
</span><span class="cx"> boolean callWithSequenceThatRequiresInclude(sequence<TestEventTarget> sequenceArg);
</span><span class="cx">
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> typedef unsigned long long ULONGLONG;
</span><span class="cx"> typedef [Clamp] unsigned long long ULONGLONG_CLAMP;
</span><span class="cx"> typedef SerializedScriptValue SCRIPT_VALUE;
</span><del>-typedef long[] ARRAY_OF_LONGS;
</del><ins>+typedef sequence<long> SEQUENCE_OF_LONGS;
</ins><span class="cx"> typedef SVGPoint SVGPOINT;
</span><span class="cx"> typedef DOMString STRING;
</span><del>-typedef DOMString[] ARRAY_OF_STRINGS;
</del><ins>+typedef sequence<DOMString> SEQUENCE_OF_STRINGS;
</ins><span class="cx"> typedef TestCallback TEST_CALLBACK;
</span><span class="cx"> typedef TestSubObjConstructor T;
</span><span class="cx"> typedef Int32Array ARRAY;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoKeyidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoKey.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoKey.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/crypto/CryptoKey.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -50,5 +50,5 @@
</span><span class="cx"> readonly attribute KeyType type;
</span><span class="cx"> readonly attribute boolean extractable;
</span><span class="cx"> [Custom] readonly attribute Algorithm algorithm;
</span><del>- readonly attribute KeyUsage[] usages;
</del><ins>+ readonly attribute sequence<KeyUsage> usages;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessageEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessageEvent.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessageEvent.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/dom/MessageEvent.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><span class="cx"> [InitializedByEventConstructor, CachedAttribute, CustomGetter] readonly attribute any data;
</span><del>- [InitializedByEventConstructor] readonly attribute MessagePort[] ports;
</del><ins>+ [InitializedByEventConstructor] readonly attribute sequence<MessagePort> ports;
</ins><span class="cx">
</span><span class="cx"> [Custom] void initMessageEvent(optional DOMString typeArg,
</span><span class="cx"> optional boolean canBubbleArg,
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (204335 => 204336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-08-10 17:19:31 UTC (rev 204335)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-08-10 17:32:15 UTC (rev 204336)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> DOMString visiblePlaceholder(Element element);
</span><span class="cx"> void selectColorInColorChooser(HTMLInputElement element, DOMString colorValue);
</span><del>- [RaisesException] DOMString[] formControlStateOfPreviousHistoryItem();
</del><ins>+ [RaisesException] sequence<DOMString> formControlStateOfPreviousHistoryItem();
</ins><span class="cx"> [RaisesException] void setFormControlStateOfPreviousHistoryItem(sequence<DOMString> values);
</span><span class="cx">
</span><span class="cx"> [RaisesException] ClientRect absoluteCaretBounds();
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> DOMString counterValue(Element element);
</span><span class="cx"> long pageNumber(Element element, optional unrestricted float pageWidth = 800, optional unrestricted float pageHeight = 600);
</span><del>- DOMString[] shortcutIconURLs();
</del><ins>+ sequence<DOMString> shortcutIconURLs();
</ins><span class="cx"> long numberOfPages(optional unrestricted double pageWidthInPixels = 800, optional unrestricted double pageHeightInPixels = 600);
</span><span class="cx"> [RaisesException] DOMString pageProperty(DOMString propertyName, long pageNumber);
</span><span class="cx"> [RaisesException] DOMString pageSizeAndMarginsInPixels(long pageIndex, long width, long height, long marginTop, long marginRight, long marginBottom, long marginLeft);
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> TypeConversions typeConversions();
</span><span class="cx"> MemoryInfo memoryInfo();
</span><span class="cx">
</span><del>- DOMString[] getReferencedFilePaths();
</del><ins>+ sequence<DOMString> getReferencedFilePaths();
</ins><span class="cx">
</span><span class="cx"> // These functions both reset the tracked repaint rects. They are intended to be used in the following order:
</span><span class="cx"> // startTrackingRepaints, repaintRectsAsText, stopTrackingRepaints.
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> [RaisesException] ClientRect selectionBounds();
</span><span class="cx">
</span><span class="cx"> [Conditional=MEDIA_SOURCE] void initializeMockMediaSource();
</span><del>- [Conditional=MEDIA_SOURCE] DOMString[] bufferedSamplesForTrackID(SourceBuffer buffer, DOMString trackID);
</del><ins>+ [Conditional=MEDIA_SOURCE] sequence<DOMString> bufferedSamplesForTrackID(SourceBuffer buffer, DOMString trackID);
</ins><span class="cx"> [Conditional=MEDIA_SOURCE] void setShouldGenerateTimestamps(SourceBuffer buffer, boolean flag);
</span><span class="cx">
</span><span class="cx"> [Conditional=VIDEO, RaisesException] void beginMediaSessionInterruption(DOMString interruptionType);
</span></span></pre>
</div>
</div>
</body>
</html>