<!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>[208023] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208023">208023</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 19:03:05 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Move code generators off of domSignature::type and onto domSignature::idlType
https://bugs.webkit.org/show_bug.cgi?id=164089
Patch by Sam Weinig <sam@webkit.org> on 2016-10-27
Reviewed by Alex Christensen.
Source/WebCore:
Make more IDLParser structures contain domTypes for type descriptions, rather than strings:
- domInterface gains type and parentType.
- domConstant gains type.
- domEnum gains type.
- domDictionary gains type and parentType.
With these structs now containing domTypes, we can update the CodeGenerators to operate on
domTypes exclusively, rather than types as strings. This allows us to consistently have access
to information such as subtypes and nullability.
* bindings/scripts/CodeGenerator.pm:
Update helpers to operate of domTypes. The one exception is SkipIncludeHeader, which
still operates on a type name, since it is called late in code generation on the textual
form of type names in the include list.
* bindings/scripts/CodeGeneratorJS.pm:
Update to use domTypes.
* bindings/scripts/IDLParser.pm:
- Add domType accessors to domInterface, domConstant, domEnum, and domDictionary
and populate them.
- Remove type accessors from domSignature (domType is accessible from idlType).
- Remove special cases for sequence and FrozenArray, now that they are always
accessed as domTypes.
* html/HTMLEmbedElement.idl:
* html/HTMLFrameElement.idl:
* html/HTMLFrameOwnerElement.cpp:
(WebCore::HTMLFrameOwnerElement::getSVGDocument):
* html/HTMLFrameOwnerElement.h:
* html/HTMLIFrameElement.idl:
* html/HTMLObjectElement.idl:
Fix interfaces declaring getSVGDocument() to correctly have it return
a Document, rather than an SVGDocument, which does exist anymore. To
make the bindings happy, also change the signature of HTMLFrameOwnerElement::getSVGDocument
to return a Document.
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
* bindings/scripts/test/JS/JSTestInterface.cpp:
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp:
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
Update test results to remove some redundant headers (Already included JSFoo.h, so no need for Foo.h).
Tools:
* DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm:
* WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
Update for the removal of domSignature::type, and new signatures of helper predicates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.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="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementidl">trunk/Source/WebCore/html/HTMLEmbedElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameElementidl">trunk/Source/WebCore/html/HTMLFrameElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp">trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementh">trunk/Source/WebCore/html/HTMLFrameOwnerElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLIFrameElementidl">trunk/Source/WebCore/html/HTMLIFrameElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementidl">trunk/Source/WebCore/html/HTMLObjectElement.idl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeBindingsCodeGeneratorDumpRenderTreepm">trunk/Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsCodeGeneratorTestRunnerpm">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2016-10-27 Sam Weinig <sam@webkit.org>
+
+ [WebIDL] Move code generators off of domSignature::type and onto domSignature::idlType
+ https://bugs.webkit.org/show_bug.cgi?id=164089
+
+ Reviewed by Alex Christensen.
+
+ Make more IDLParser structures contain domTypes for type descriptions, rather than strings:
+ - domInterface gains type and parentType.
+ - domConstant gains type.
+ - domEnum gains type.
+ - domDictionary gains type and parentType.
+
+ With these structs now containing domTypes, we can update the CodeGenerators to operate on
+ domTypes exclusively, rather than types as strings. This allows us to consistently have access
+ to information such as subtypes and nullability.
+
+ * bindings/scripts/CodeGenerator.pm:
+ Update helpers to operate of domTypes. The one exception is SkipIncludeHeader, which
+ still operates on a type name, since it is called late in code generation on the textual
+ form of type names in the include list.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ Update to use domTypes.
+
+ * bindings/scripts/IDLParser.pm:
+ - Add domType accessors to domInterface, domConstant, domEnum, and domDictionary
+ and populate them.
+ - Remove type accessors from domSignature (domType is accessible from idlType).
+ - Remove special cases for sequence and FrozenArray, now that they are always
+ accessed as domTypes.
+
+ * html/HTMLEmbedElement.idl:
+ * html/HTMLFrameElement.idl:
+ * html/HTMLFrameOwnerElement.cpp:
+ (WebCore::HTMLFrameOwnerElement::getSVGDocument):
+ * html/HTMLFrameOwnerElement.h:
+ * html/HTMLIFrameElement.idl:
+ * html/HTMLObjectElement.idl:
+ Fix interfaces declaring getSVGDocument() to correctly have it return
+ a Document, rather than an SVGDocument, which does exist anymore. To
+ make the bindings happy, also change the signature of HTMLFrameOwnerElement::getSVGDocument
+ to return a Document.
+
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp:
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ Update test results to remove some redundant headers (Already included JSFoo.h, so no need for Foo.h).
+
</ins><span class="cx"> 2016-10-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [macOS] [WebGL2] Temporarily upgrade WebGL 2's internal OpenGL context from version 2.1 to 3.2
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> my $outerInterface = shift;
</span><span class="cx"> my $currentInterface = shift;
</span><span class="cx">
</span><del>- for (@{$currentInterface->parents}) {
- my $interfaceName = $_;
</del><ins>+ if ($currentInterface->parentType) {
+ my $interfaceName = $currentInterface->parentType->name;
</ins><span class="cx"> my $parentInterface = $object->ParseInterface($outerInterface, $interfaceName);
</span><span class="cx">
</span><span class="cx"> if ($beforeRecursion) {
</span><span class="lines">@@ -326,12 +326,9 @@
</span><span class="cx"> return $idlFiles->{$interfaceName};
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetAttributeFromInterface()
</del><ins>+sub GetAttributeFromInterface
</ins><span class="cx"> {
</span><del>- my $object = shift;
- my $outerInterface = shift;
- my $interfaceName = shift;
- my $attributeName = shift;
</del><ins>+ my ($object, $outerInterface, $interfaceName, $attributeName) = @_;
</ins><span class="cx">
</span><span class="cx"> my $interface = $object->ParseInterface($outerInterface, $interfaceName);
</span><span class="cx"> for my $attribute (@{$interface->attributes}) {
</span><span class="lines">@@ -377,19 +374,19 @@
</span><span class="cx">
</span><span class="cx"> sub SkipIncludeHeader
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $typeName) = @_;
</ins><span class="cx">
</span><span class="cx"> # FIXME: This is a lot like !IsRefPtrType. Maybe they could share code?
</span><span class="cx">
</span><del>- return 1 if $object->IsPrimitiveType($type);
- return 1 if $object->IsTypedArrayType($type);
- return 1 if $type eq "Array";
- return 1 if $type eq "BufferSource";
- return 1 if $type eq "DOMString" or $type eq "USVString";
- return 1 if $type eq "DOMTimeStamp";
- return 1 if $type eq "SVGNumber";
- return 1 if $type eq "any";
</del><ins>+ return 1 if $primitiveTypeHash{$typeName};
+ return 1 if $integerTypeHash{$typeName};
+ return 1 if $floatingPointTypeHash{$typeName};
+ return 1 if $typedArrayTypes{$typeName};
+ return 1 if $typeName eq "DOMString";
+ return 1 if $typeName eq "USVString";
+ return 1 if $typeName eq "BufferSource";
+ return 1 if $typeName eq "SVGNumber";
+ return 1 if $typeName eq "any";
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -398,8 +395,10 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $integerTypeHash{$type};
- return 1 if $floatingPointTypeHash{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $integerTypeHash{$type->name};
+ return 1 if $floatingPointTypeHash{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -407,7 +406,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $type eq "DOMString" or $type eq "USVString";
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $object->IsStringType($type);
</ins><span class="cx"> return 1 if $object->IsEnumType($type);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -416,7 +417,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $integerTypeHash{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $integerTypeHash{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -424,7 +427,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $floatingPointTypeHash{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $floatingPointTypeHash{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -432,7 +437,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $primitiveTypeHash{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $primitiveTypeHash{$type->name};
</ins><span class="cx"> return 1 if $object->IsNumericType($type);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -442,8 +449,10 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $type eq "DOMString";
- return 1 if $type eq "USVString";
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $type->name eq "DOMString";
+ return 1 if $type->name eq "USVString";
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -451,13 +460,19 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return defined($object->GetEnumByName($type));
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return defined($object->GetEnumByType($type));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetEnumByName
</del><ins>+sub GetEnumByType
</ins><span class="cx"> {
</span><del>- my ($object, $name) = @_;
-
</del><ins>+ my ($object, $type) = @_;
+
+ assert("Not a type") if ref($type) ne "domType";
+
+ my $name = $type->name;
+
</ins><span class="cx"> die "GetEnumByName() was called with an undefined enumeration name" unless defined($name);
</span><span class="cx">
</span><span class="cx"> for my $enumeration (@{$useDocument->enumerations}) {
</span><span class="lines">@@ -494,17 +509,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $object->IsEnumType($type) && defined($cachedExternalEnumerations->{$type});
-}
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
</ins><span class="cx">
</span><del>-sub ValidEnumValues
-{
- my ($object, $type) = @_;
-
- my $enumeration = $object->GetEnumByName($type);
- die "ValidEnumValues() was with a type that is not an enumeration: " . $type unless defined($enumeration);
-
- return $enumeration->values;
</del><ins>+ return $object->IsEnumType($type) && defined($cachedExternalEnumerations->{$type->name});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub HasEnumImplementationNameOverride
</span><span class="lines">@@ -511,7 +518,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if exists $enumTypeImplementationNameOverrides{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if exists $enumTypeImplementationNameOverrides{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -519,14 +528,21 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $enumTypeImplementationNameOverrides{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $enumTypeImplementationNameOverrides{$type->name};
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetDictionaryByName
</del><ins>+sub GetDictionaryByType
</ins><span class="cx"> {
</span><del>- my ($object, $name) = @_;
- die "GetDictionaryByName() was called with an undefined dictionary name" unless defined($name);
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ my $name = $type->name;
+
+ die "GetDictionaryByType() was called with an undefined dictionary name" unless defined($name);
+
</ins><span class="cx"> for my $dictionary (@{$useDocument->dictionaries}) {
</span><span class="cx"> return $dictionary if $dictionary->name eq $name;
</span><span class="cx"> }
</span><span class="lines">@@ -560,7 +576,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $type =~ /^[A-Z]/ && defined($object->GetDictionaryByName($type));
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $type->name =~ /^[A-Z]/ && defined($object->GetDictionaryByType($type));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # A dictionary defined in its own IDL file.
</span><span class="lines">@@ -568,7 +586,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $object->IsDictionaryType($type) && defined($cachedExternalDictionaries->{$type});
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $object->IsDictionaryType($type) && defined($cachedExternalDictionaries->{$type->name});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub HasDictionaryImplementationNameOverride
</span><span class="lines">@@ -575,7 +595,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if exists $dictionaryTypeImplementationNameOverrides{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if exists $dictionaryTypeImplementationNameOverrides{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -583,7 +605,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $dictionaryTypeImplementationNameOverrides{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $dictionaryTypeImplementationNameOverrides{$type->name};
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsNonPointerType
</span><span class="lines">@@ -590,68 +614,76 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return 1 if $nonPointerTypeHash{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $nonPointerTypeHash{$type->name};
</ins><span class="cx"> return 1 if $object->IsPrimitiveType($type);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub IsSVGTypeNeedingTearOff
</del><ins>+sub IsSVGTypeNeedingTearOffForType
</ins><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return 1 if exists $svgTypeNeedingTearOff{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if exists $svgTypeNeedingTearOff{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub IsSVGTypeWithWritablePropertiesNeedingTearOff
</del><ins>+sub IsSVGTypeWithWritablePropertiesNeedingTearOffForType
</ins><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return 1 if $svgTypeWithWritablePropertiesNeedingTearOff{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $svgTypeWithWritablePropertiesNeedingTearOff{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsTypedArrayType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return 1 if $typedArrayTypes{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return 1 if $typedArrayTypes{$type->name};
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsRefPtrType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><ins>+ assert("Not a type") if ref($type) ne "domType";
+
</ins><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><span class="cx"> return 0 if $object->IsSequenceOrFrozenArrayType($type);
</span><del>- return 0 if $type eq "DOMString" or $type eq "USVString";
- return 0 if $type eq "any";
</del><ins>+ return 0 if $object->IsStringType($type);
+ return 0 if $type->name eq "any";
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetSVGTypeNeedingTearOff
</del><ins>+sub GetSVGTypeNeedingTearOffForType
</ins><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $svgTypeNeedingTearOff{$type} if exists $svgTypeNeedingTearOff{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $svgTypeNeedingTearOff{$type->name} if exists $svgTypeNeedingTearOff{$type->name};
</ins><span class="cx"> return undef;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetSVGWrappedTypeNeedingTearOff
</del><ins>+sub GetSVGWrappedTypeNeedingTearOffForType
</ins><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- my $svgTypeNeedingTearOff = $object->GetSVGTypeNeedingTearOff($type);
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ my $svgTypeNeedingTearOff = $object->GetSVGTypeNeedingTearOffForType($type);
</ins><span class="cx"> return $svgTypeNeedingTearOff if not $svgTypeNeedingTearOff;
</span><span class="cx">
</span><span class="cx"> if ($svgTypeNeedingTearOff =~ /SVGPropertyTearOff/) {
</span><span class="lines">@@ -668,64 +700,84 @@
</span><span class="cx"> return $svgTypeNeedingTearOff;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsSVGAnimatedTypeName
+{
+ my ($object, $typeName) = @_;
+
+ return $typeName =~ /^SVGAnimated/;
+}
+
</ins><span class="cx"> sub IsSVGAnimatedType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $type =~ /^SVGAnimated/;
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $object->IsSVGAnimatedTypeName($type->name);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsConstructorType
+{
+ my ($object, $type) = @_;
+
+ assert("Not a type") if ref($type) ne "domType";
+
+ return $type->name =~ /Constructor$/;
+}
+
</ins><span class="cx"> sub IsSequenceType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $type =~ /^sequence</;
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $type->name eq "sequence";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetSequenceInnerType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $1 if $type =~ /^sequence<([\w\d_\s]+)>.*/;
- return "";
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return @{$type->subtypes}[0];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsFrozenArrayType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $type =~ /^FrozenArray</;
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ # FIXME: Update parser to make this just 'FrozenArray'
+ return $type->name eq "FrozenArray";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetFrozenArrayInnerType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $1 if $type =~ /^FrozenArray<([\w\d_\s]+)>.*/;
- return "";
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return @{$type->subtypes}[0];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsSequenceOrFrozenArrayType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><ins>+ assert("Not a type") if ref($type) ne "domType";
+
</ins><span class="cx"> return $object->IsSequenceType($type) || $object->IsFrozenArrayType($type);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetSequenceOrFrozenArrayInnerType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return $object->GetSequenceInnerType($type) if $object->IsSequenceType($type);
- return $object->GetFrozenArrayInnerType($type) if $object->IsFrozenArrayType($type);
- return "";
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return @{$type->subtypes}[0];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # These match WK_lcfirst and WK_ucfirst defined in builtins_generator.py.
</span><span class="lines">@@ -734,6 +786,7 @@
</span><span class="cx"> sub WK_ucfirst
</span><span class="cx"> {
</span><span class="cx"> my ($object, $param) = @_;
</span><ins>+
</ins><span class="cx"> my $ret = ucfirst($param);
</span><span class="cx"> $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
</span><span class="cx"> $ret =~ s/Svg/SVG/ if $ret =~ /^Svg/;
</span><span class="lines">@@ -746,6 +799,7 @@
</span><span class="cx"> sub WK_lcfirst
</span><span class="cx"> {
</span><span class="cx"> my ($object, $param) = @_;
</span><ins>+
</ins><span class="cx"> my $ret = lcfirst($param);
</span><span class="cx"> $ret =~ s/dOM/dom/ if $ret =~ /^dOM/;
</span><span class="cx"> $ret =~ s/hTML/html/ if $ret =~ /^hTML/;
</span><span class="lines">@@ -764,7 +818,8 @@
</span><span class="cx"> return $ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub slurp {
</del><ins>+sub slurp
+{
</ins><span class="cx"> my $file = shift;
</span><span class="cx">
</span><span class="cx"> open my $fh, '<', $file or die;
</span><span class="lines">@@ -777,6 +832,7 @@
</span><span class="cx"> sub trim
</span><span class="cx"> {
</span><span class="cx"> my $string = shift;
</span><ins>+
</ins><span class="cx"> $string =~ s/^\s+|\s+$//g;
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span><span class="lines">@@ -785,6 +841,7 @@
</span><span class="cx"> sub NamespaceForAttributeName
</span><span class="cx"> {
</span><span class="cx"> my ($object, $interfaceName, $attributeName) = @_;
</span><ins>+
</ins><span class="cx"> return "SVGNames" if $interfaceName =~ /^SVG/ && !$svgAttributesInHTMLHash{$attributeName};
</span><span class="cx"> return "HTMLNames";
</span><span class="cx"> }
</span><span class="lines">@@ -820,7 +877,7 @@
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"ImplementedAs"}) {
</span><span class="cx"> $attributeName = $attribute->signature->extendedAttributes->{"ImplementedAs"};
</span><span class="cx"> }
</span><del>- my $attributeType = $attribute->signature->type;
</del><ins>+ my $attributeType = $attribute->signature->idlType;
</ins><span class="cx">
</span><span class="cx"> # SVG animated types need to use a special attribute name.
</span><span class="cx"> # The rest of the special casing for SVG animated types is handled in the language-specific code generators.
</span><span class="lines">@@ -854,16 +911,16 @@
</span><span class="cx"> return ($generator->WK_lcfirst($generator->AttributeNameForGetterAndSetter($attribute)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $attributeType = $attribute->signature->type;
</del><ins>+ my $attributeType = $attribute->signature->idlType;
</ins><span class="cx">
</span><span class="cx"> my $functionName;
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"URL"}) {
</span><span class="cx"> $functionName = "getURLAttribute";
</span><del>- } elsif ($attributeType eq "boolean") {
</del><ins>+ } elsif ($attributeType->name eq "boolean") {
</ins><span class="cx"> $functionName = "hasAttributeWithoutSynchronization";
</span><del>- } elsif ($attributeType eq "long") {
</del><ins>+ } elsif ($attributeType->name eq "long") {
</ins><span class="cx"> $functionName = "getIntegralAttribute";
</span><del>- } elsif ($attributeType eq "unsigned long") {
</del><ins>+ } elsif ($attributeType->name eq "unsigned long") {
</ins><span class="cx"> $functionName = "getUnsignedIntegralAttribute";
</span><span class="cx"> } else {
</span><span class="cx"> if ($contentAttributeName eq "WebCore::HTMLNames::idAttr") {
</span><span class="lines">@@ -892,14 +949,14 @@
</span><span class="cx"> return ("set" . $generator->WK_ucfirst($generator->AttributeNameForGetterAndSetter($attribute)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $attributeType = $attribute->signature->type;
</del><ins>+ my $attributeType = $attribute->signature->idlType;
</ins><span class="cx">
</span><span class="cx"> my $functionName;
</span><del>- if ($attributeType eq "boolean") {
</del><ins>+ if ($attributeType->name eq "boolean") {
</ins><span class="cx"> $functionName = "setBooleanAttribute";
</span><del>- } elsif ($attributeType eq "long") {
</del><ins>+ } elsif ($attributeType->name eq "long") {
</ins><span class="cx"> $functionName = "setIntegralAttribute";
</span><del>- } elsif ($attributeType eq "unsigned long") {
</del><ins>+ } elsif ($attributeType->name eq "unsigned long") {
</ins><span class="cx"> $functionName = "setUnsignedIntegralAttribute";
</span><span class="cx"> } elsif ($generator->IsSVGAnimatedType($attributeType)) {
</span><span class="cx"> $functionName = "setAttribute";
</span><span class="lines">@@ -912,25 +969,25 @@
</span><span class="cx">
</span><span class="cx"> sub IsWrapperType
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><ins>+ assert("Not a type") if ref($type) ne "domType";
+
</ins><span class="cx"> return 0 if !$object->IsRefPtrType($type);
</span><span class="cx"> return 0 if $object->IsTypedArrayType($type);
</span><del>- return 0 if $type eq "BufferSource";
- return 0 if $type eq "UNION";
- return 0 if $webCoreTypeHash{$type};
</del><ins>+ return 0 if $type->name eq "BufferSource";
+ return 0 if $type->name eq "UNION";
+ return 0 if $webCoreTypeHash{$type->name};
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub getInterfaceExtendedAttributesFromName
</del><ins>+sub GetInterfaceExtendedAttributesFromName
</ins><span class="cx"> {
</span><span class="cx"> # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
</span><span class="cx"> # Overusing this kind of function can make things really slow. Lets avoid these if we can.
</span><span class="cx">
</span><del>- my $object = shift;
- my $interfaceName = shift;
</del><ins>+ my ($object, $interfaceName) = @_;
</ins><span class="cx">
</span><span class="cx"> my $idlFile = $object->IDLFileForInterface($interfaceName) or assert("Could NOT find IDL file for interface \"$interfaceName\"!\n");
</span><span class="cx">
</span><span class="lines">@@ -959,19 +1016,21 @@
</span><span class="cx">
</span><span class="cx"> sub ComputeIsCallbackInterface
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return 0 unless $object->IsWrapperType($type);
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
</ins><span class="cx">
</span><del>- my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
</del><ins>+ return 0 unless $object->IsWrapperType($type);
</ins><span class="cx">
</span><del>- open FILE, "<", $idlFile or die;
- my @lines = <FILE>;
- close FILE;
</del><ins>+ my $typeName = $type->name;
+ my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
</ins><span class="cx">
</span><del>- my $fileContents = join('', @lines);
- return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
</del><ins>+ open FILE, "<", $idlFile or die;
+ my @lines = <FILE>;
+ close FILE;
+
+ my $fileContents = join('', @lines);
+ return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my %isCallbackInterface = ();
</span><span class="lines">@@ -984,9 +1043,11 @@
</span><span class="cx">
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $isCallbackInterface{$type} if exists $isCallbackInterface{$type};
- my $result = ComputeIsCallbackInterface($object, $type);
- $isCallbackInterface{$type} = $result;
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $isCallbackInterface{$type->name} if exists $isCallbackInterface{$type->name};
+ my $result = $object->ComputeIsCallbackInterface($type);
+ $isCallbackInterface{$type->name} = $result;
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -995,32 +1056,34 @@
</span><span class="cx"> # https://heycam.github.io/webidl/#idl-callback-functions
</span><span class="cx"> sub ComputeIsFunctionOnlyCallbackInterface
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $type = shift;
</del><ins>+ my ($object, $type) = @_;
</ins><span class="cx">
</span><del>- return 0 unless $object->IsCallbackInterface($type);
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
</ins><span class="cx">
</span><del>- my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
</del><ins>+ return 0 unless $object->IsCallbackInterface($type);
</ins><span class="cx">
</span><del>- open FILE, "<", $idlFile or die;
- my @lines = <FILE>;
- close FILE;
</del><ins>+ my $typeName = $type->name;
+ my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
</ins><span class="cx">
</span><del>- my $fileContents = join('', @lines);
- if ($fileContents =~ /\[(.*)\]\s+callback\s+interface\s+(\w+)/gs) {
- my @parts = split(',', $1);
- foreach my $part (@parts) {
- my @keyValue = split('=', $part);
- my $key = trim($keyValue[0]);
- next unless length($key);
- my $value = "VALUE_IS_MISSING";
- $value = trim($keyValue[1]) if @keyValue > 1;
</del><ins>+ open FILE, "<", $idlFile or die;
+ my @lines = <FILE>;
+ close FILE;
</ins><span class="cx">
</span><del>- return 1 if ($key eq "Callback" && $value eq "FunctionOnly");
- }
- }
</del><ins>+ my $fileContents = join('', @lines);
+ if ($fileContents =~ /\[(.*)\]\s+callback\s+interface\s+(\w+)/gs) {
+ my @parts = split(',', $1);
+ foreach my $part (@parts) {
+ my @keyValue = split('=', $part);
+ my $key = trim($keyValue[0]);
+ next unless length($key);
+ my $value = "VALUE_IS_MISSING";
+ $value = trim($keyValue[1]) if @keyValue > 1;
</ins><span class="cx">
</span><del>- return 0;
</del><ins>+ return 1 if ($key eq "Callback" && $value eq "FunctionOnly");
+ }
+ }
+
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my %isFunctionOnlyCallbackInterface = ();
</span><span class="lines">@@ -1033,16 +1096,17 @@
</span><span class="cx">
</span><span class="cx"> my ($object, $type) = @_;
</span><span class="cx">
</span><del>- return $isFunctionOnlyCallbackInterface{$type} if exists $isFunctionOnlyCallbackInterface{$type};
- my $result = ComputeIsFunctionOnlyCallbackInterface($object, $type);
- $isFunctionOnlyCallbackInterface{$type} = $result;
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ return $isFunctionOnlyCallbackInterface{$type->name} if exists $isFunctionOnlyCallbackInterface{$type->name};
+ my $result = $object->ComputeIsFunctionOnlyCallbackInterface($type);
+ $isFunctionOnlyCallbackInterface{$type->name} = $result;
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateConditionalString
</span><span class="cx"> {
</span><del>- my $generator = shift;
- my $node = shift;
</del><ins>+ my ($generator, $node) = @_;
</ins><span class="cx">
</span><span class="cx"> my $conditional = $node->extendedAttributes->{"Conditional"};
</span><span class="cx"> if ($conditional) {
</span><span class="lines">@@ -1054,8 +1118,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateConditionalStringFromAttributeValue
</span><span class="cx"> {
</span><del>- my $generator = shift;
- my $conditional = shift;
</del><ins>+ my ($generator, $conditional) = @_;
</ins><span class="cx">
</span><span class="cx"> my %disjunction;
</span><span class="cx"> map {
</span><span class="lines">@@ -1114,8 +1177,8 @@
</span><span class="cx"> # should use the real interface name in the IDL files and then use ImplementedAs to map this to the implementation name.
</span><span class="cx"> sub GetVisibleInterfaceName
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $interface = shift;
</del><ins>+ my ($object, $interface) = @_;
+
</ins><span class="cx"> my $interfaceName = $interface->extendedAttributes->{"InterfaceName"};
</span><span class="cx"> return $interfaceName ? $interfaceName : $interface->name;
</span><span class="cx"> }
</span><span class="lines">@@ -1122,12 +1185,11 @@
</span><span class="cx">
</span><span class="cx"> sub InheritsInterface
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $interface = shift;
- my $interfaceName = shift;
- my $found = 0;
</del><ins>+ my ($object, $interface, $interfaceName) = @_;
</ins><span class="cx">
</span><span class="cx"> return 1 if $interfaceName eq $interface->name;
</span><ins>+
+ my $found = 0;
</ins><span class="cx"> $object->ForAllParents($interface, sub {
</span><span class="cx"> my $currentInterface = shift;
</span><span class="cx"> if ($currentInterface->name eq $interfaceName) {
</span><span class="lines">@@ -1141,12 +1203,11 @@
</span><span class="cx">
</span><span class="cx"> sub InheritsExtendedAttribute
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $interface = shift;
- my $extendedAttribute = shift;
- my $found = 0;
</del><ins>+ my ($object, $interface, $extendedAttribute) = @_;
</ins><span class="cx">
</span><span class="cx"> return 1 if $interface->extendedAttributes->{$extendedAttribute};
</span><ins>+
+ my $found = 0;
</ins><span class="cx"> $object->ForAllParents($interface, sub {
</span><span class="cx"> my $currentInterface = shift;
</span><span class="cx"> if ($currentInterface->extendedAttributes->{$extendedAttribute}) {
</span><span class="lines">@@ -1160,14 +1221,12 @@
</span><span class="cx">
</span><span class="cx"> sub ShouldPassWrapperByReference
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $parameter = shift;
- my $interface = shift;
</del><ins>+ my ($object, $parameter, $interface) = @_;
</ins><span class="cx">
</span><span class="cx"> return 0 if $parameter->isVariadic;
</span><span class="cx"> return 0 if $parameter->isNullable;
</span><del>- return 0 if !$object->IsWrapperType($parameter->type) && !$object->IsTypedArrayType($parameter->type);
- return 0 if $object->IsSVGTypeNeedingTearOff($parameter->type);
</del><ins>+ return 0 if !$object->IsWrapperType($parameter->idlType) && !$object->IsTypedArrayType($parameter->idlType);
+ return 0 if $object->IsSVGTypeNeedingTearOffForType($parameter->idlType);
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $enumeration) = @_;
</span><span class="cx">
</span><del>- my $className = GetEnumerationClassName($enumeration->name);
</del><ins>+ my $className = GetEnumerationClassName($enumeration->type);
</ins><span class="cx"> $object->GenerateEnumerationHeader($enumeration, $className);
</span><span class="cx"> $object->GenerateEnumerationImplementation($enumeration, $className);
</span><span class="cx"> }
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $dictionary, $enumerations) = @_;
</span><span class="cx">
</span><del>- my $className = GetDictionaryClassName($dictionary->name);
</del><ins>+ my $className = GetDictionaryClassName($dictionary->type);
</ins><span class="cx"> $object->GenerateDictionaryHeader($dictionary, $className, $enumerations);
</span><span class="cx"> $object->GenerateDictionaryImplementation($dictionary, $className, $enumerations);
</span><span class="cx"> }
</span><span class="lines">@@ -179,14 +179,13 @@
</span><span class="cx"> $extendedAttributeList->{ImplementedAs} = $attribute->signature->name;
</span><span class="cx"> $stringifier->signature->extendedAttributes($extendedAttributeList);
</span><span class="cx"> $stringifier->signature->name("toString");
</span><del>- die "stringifier can only be used on attributes of String types" unless $codeGenerator->IsStringType($attribute->signature->type);
</del><ins>+ die "stringifier can only be used on attributes of String types" unless $codeGenerator->IsStringType($attribute->signature->idlType);
</ins><span class="cx">
</span><span class="cx"> # FIXME: This should use IDLParser's cloneType.
</span><span class="cx"> my $type = domType->new();
</span><del>- $type->name($attribute->signature->type);
</del><ins>+ $type->name($attribute->signature->idlType->name);
</ins><span class="cx">
</span><span class="cx"> $stringifier->signature->idlType($type);
</span><del>- $stringifier->signature->type($type->name);
</del><span class="cx">
</span><span class="cx"> push(@{$interface->functions}, $stringifier);
</span><span class="cx"> last;
</span><span class="lines">@@ -210,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> return $interface->extendedAttributes->{JSLegacyParent} if $interface->extendedAttributes->{JSLegacyParent};
</span><span class="cx"> return "JSDOMObject" unless NeedsImplementationClass($interface);
</span><del>- return "JSDOMWrapper<" . GetImplClassName($interface->name) . ">" unless $interface->parent;
</del><ins>+ return "JSDOMWrapper<" . GetImplClassName($interface) . ">" unless $interface->parent;
</ins><span class="cx"> return "JS" . $interface->parent;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,52 +227,35 @@
</span><span class="cx"> return $callbackInterface->extendedAttributes->{IsWeakCallback} ? "JSCallbackDataWeak" : "JSCallbackDataStrong";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub AddIncludesForTypeInImpl
</del><ins>+sub GetExportMacroForJSClass
</ins><span class="cx"> {
</span><del>- my $type = shift;
- my $isCallback = @_ ? shift : 0;
-
- AddIncludesForType($type, $isCallback, \%implIncludes);
</del><ins>+ my $interface = shift;
+
+ return $interface->extendedAttributes->{ExportMacro} . " " if $interface->extendedAttributes->{ExportMacro};
+ return "";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub AddIncludesForTypeInHeader
</del><ins>+sub AddIncludesForImplementationTypeInImpl
</ins><span class="cx"> {
</span><del>- my $type = shift;
- my $isCallback = @_ ? shift : 0;
</del><ins>+ my $implementationType = shift;
</ins><span class="cx">
</span><del>- AddIncludesForType($type, $isCallback, \%headerIncludes);
</del><ins>+ AddIncludesForImplementationType($implementationType, \%implIncludes);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetExportMacroForJSClass
</del><ins>+sub AddIncludesForImplementationTypeInHeader
</ins><span class="cx"> {
</span><del>- my $interface = shift;
-
- return $interface->extendedAttributes->{ExportMacro} . " " if $interface->extendedAttributes->{ExportMacro};
- return "";
</del><ins>+ my $implementationType = shift;
+
+ AddIncludesForImplementationType($implementationType, \%headerIncludes);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub AddIncludesForType
</del><ins>+sub AddIncludesForImplementationType
</ins><span class="cx"> {
</span><del>- my $type = shift;
- my $isCallback = shift;
- my $includesRef = shift;
</del><ins>+ my ($implementationType, $includesRef) = @_;
</ins><span class="cx">
</span><del>- return if $codeGenerator->SkipIncludeHeader($type);
-
- # When we're finished with the one-file-per-class reorganization, we won't need these special cases.
- if ($isCallback && $codeGenerator->IsWrapperType($type)) {
- $includesRef->{"JS${type}.h"} = 1;
- } elsif ($codeGenerator->IsSequenceOrFrozenArrayType($type)) {
- my $innerType = $codeGenerator->GetSequenceOrFrozenArrayInnerType($type);
- if ($codeGenerator->IsRefPtrType($innerType)) {
- $includesRef->{"JS${innerType}.h"} = 1;
- $includesRef->{"${innerType}.h"} = 1;
- }
- $includesRef->{"<runtime/JSArray.h>"} = 1;
- } else {
- # default, include the same named file
- $includesRef->{"${type}.h"} = 1;
- }
</del><ins>+ return if $codeGenerator->SkipIncludeHeader($implementationType);
+
+ $includesRef->{"${implementationType}.h"} = 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub AddToImplIncludesForIDLType
</span><span class="lines">@@ -292,20 +274,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsSequenceOrFrozenArrayType($idlType->name)) {
</del><ins>+ if ($codeGenerator->IsSequenceOrFrozenArrayType($idlType)) {
+ AddToImplIncludes("<runtime/JSArray.h>", $conditional);
</ins><span class="cx"> AddToImplIncludesForIDLType(@{$idlType->subtypes}[0], $conditional);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsExternalDictionaryType($idlType->name) || $codeGenerator->IsExternalEnumType($idlType->name)) {
</del><ins>+ if ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsExternalDictionaryType($idlType) || $codeGenerator->IsExternalEnumType($idlType)) {
</ins><span class="cx"> AddToImplIncludes("JS" . $idlType->name . ".h", $conditional);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- if ($codeGenerator->IsWrapperType($idlType->name)) {
- AddToImplIncludes("JS" . $idlType->name . ".h", $conditional);
- return;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub AddToImplIncludes
</span><span class="lines">@@ -331,15 +309,14 @@
</span><span class="cx">
</span><span class="cx"> sub AddClassForwardIfNeeded
</span><span class="cx"> {
</span><del>- my $interfaceName = shift;
</del><ins>+ my $type = shift;
</ins><span class="cx">
</span><span class="cx"> # SVGAnimatedLength/Number/etc. are not classes so they can't be forward declared as classes.
</span><del>- return if $codeGenerator->IsSVGAnimatedType($interfaceName);
</del><ins>+ return if $codeGenerator->IsSVGAnimatedType($type);
+ return if $codeGenerator->IsTypedArrayType($type);
+ return if $type->name eq "BufferSource";
</ins><span class="cx">
</span><del>- return if $codeGenerator->IsTypedArrayType($interfaceName);
- return if $interfaceName eq "BufferSource";
-
- push(@headerContent, "class $interfaceName;\n\n");
</del><ins>+ push(@headerContent, "class " . $type->name . ";\n\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetGenerateIsReachable
</span><span class="lines">@@ -399,7 +376,9 @@
</span><span class="cx">
</span><span class="cx"> # If the item function returns a string then we let the TreatReturnedNullStringAs handle the cases
</span><span class="cx"> # where the index is out of range.
</span><del>- if ($indexedGetterFunction->signature->type eq "DOMString") {
</del><ins>+
+ # FIXME: Should this work for all string types?
+ if ($indexedGetterFunction->signature->idlType->name eq "DOMString") {
</ins><span class="cx"> push(@getOwnPropertySlotImpl, " if (optionalIndex) {\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@getOwnPropertySlotImpl, " if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {\n");
</span><span class="lines">@@ -556,7 +535,7 @@
</span><span class="cx">
</span><span class="cx"> return $codeGenerator->WK_lcfirst($className) . "Constructor" . $codeGenerator->WK_ucfirst($attribute->signature->name) if $attribute->isStatic;
</span><span class="cx"> return GetJSBuiltinFunctionName($className, $attribute) if IsJSBuiltin($interface, $attribute);
</span><del>- return "js" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
</del><ins>+ return "js" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($codeGenerator->IsConstructorType($attribute->signature->idlType) ? "Constructor" : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetAttributeSetterName
</span><span class="lines">@@ -565,7 +544,7 @@
</span><span class="cx">
</span><span class="cx"> return "set" . $codeGenerator->WK_ucfirst($className) . "Constructor" . $codeGenerator->WK_ucfirst($attribute->signature->name) if $attribute->isStatic;
</span><span class="cx"> return "set" . $codeGenerator->WK_ucfirst(GetJSBuiltinFunctionName($className, $attribute)) if IsJSBuiltin($interface, $attribute);
</span><del>- return "setJS" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
</del><ins>+ return "setJS" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($codeGenerator->IsConstructorType($attribute->signature->idlType) ? "Constructor" : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetFunctionName
</span><span class="lines">@@ -592,7 +571,7 @@
</span><span class="cx"> my $specials = $function->signature->specials;
</span><span class="cx"> my $specialExists = grep { $_ eq $special } @$specials;
</span><span class="cx"> my $parameters = $function->parameters;
</span><del>- if ($specialExists and scalar(@$parameters) == $numberOfParameters and $parameters->[0]->type eq $firstParameterType) {
</del><ins>+ if ($specialExists and scalar(@$parameters) == $numberOfParameters and $parameters->[0]->idlType->name eq $firstParameterType) {
</ins><span class="cx"> return $function;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -635,7 +614,7 @@
</span><span class="cx"> return 0 if $attribute->signature->extendedAttributes->{EnabledAtRuntime} && !IsDOMGlobalObject($interface);
</span><span class="cx">
</span><span class="cx"> return 1 if InterfaceRequiresAttributesOnInstance($interface);
</span><del>- return 1 if $attribute->signature->type =~ /Constructor$/;
</del><ins>+ return 1 if $codeGenerator->IsConstructorType($attribute->signature->idlType);
</ins><span class="cx">
</span><span class="cx"> # [Unforgeable] attributes should be on the instance.
</span><span class="cx"> # https://heycam.github.io/webidl/#Unforgeable
</span><span class="lines">@@ -677,7 +656,7 @@
</span><span class="cx"> push(@specials, "DontDelete") if IsUnforgeable($interface, $attribute);
</span><span class="cx">
</span><span class="cx"> # As per Web IDL specification, constructor properties on the ECMAScript global object should not be enumerable.
</span><del>- my $is_global_constructor = $attribute->signature->type =~ /Constructor$/;
</del><ins>+ my $is_global_constructor = $attribute->signature->idlType->name =~ /Constructor$/;
</ins><span class="cx"> push(@specials, "DontEnum") if ($attribute->signature->extendedAttributes->{NotEnumerable} || $is_global_constructor);
</span><span class="cx"> push(@specials, "ReadOnly") if IsReadonly($attribute);
</span><span class="cx"> push(@specials, "CustomAccessor") unless $is_global_constructor or IsJSBuiltin($interface, $attribute);
</span><span class="lines">@@ -798,12 +777,12 @@
</span><span class="cx">
</span><span class="cx"> sub GetImplClassName
</span><span class="cx"> {
</span><del>- my $name = shift;
</del><ins>+ my $interface = shift;
</ins><span class="cx">
</span><del>- my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($name);
</del><ins>+ my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
</ins><span class="cx"> return $svgNativeType if $svgNativeType;
</span><span class="cx">
</span><del>- return $name;
</del><ins>+ return $interface->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsClassNameWordBoundary
</span><span class="lines">@@ -835,7 +814,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $name) = @_;
</span><span class="cx">
</span><del>- my $class = GetImplClassName($interface->name);
</del><ins>+ my $class = GetImplClassName($interface);
</ins><span class="cx"> my $member = $codeGenerator->WK_ucfirst($name);
</span><span class="cx">
</span><span class="cx"> # Since the enumeration name will be nested in the class name's namespace, remove any words
</span><span class="lines">@@ -855,13 +834,17 @@
</span><span class="cx">
</span><span class="cx"> sub GetEnumerationClassName
</span><span class="cx"> {
</span><del>- my ($name, $interface) = @_;
</del><ins>+ my ($type, $interface) = @_;
</ins><span class="cx">
</span><del>- if ($codeGenerator->HasEnumImplementationNameOverride($name)) {
- return $codeGenerator->GetEnumImplementationNameOverride($name);
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
+
+ if ($codeGenerator->HasEnumImplementationNameOverride($type)) {
+ return $codeGenerator->GetEnumImplementationNameOverride($type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return $name if $codeGenerator->IsExternalEnumType($name);
</del><ins>+ my $name = $type->name;
+
+ return $name if $codeGenerator->IsExternalEnumType($type);
</ins><span class="cx"> return $name unless defined($interface);
</span><span class="cx">
</span><span class="cx"> return GetNestedClassName($interface, $name);
</span><span class="lines">@@ -999,9 +982,7 @@
</span><span class="cx">
</span><span class="cx"> my $result = "";
</span><span class="cx"> foreach my $enumeration (@$enumerations) {
</span><del>- my $name = $enumeration->name;
-
- my $className = GetEnumerationClassName($name, $interface);
</del><ins>+ my $className = GetEnumerationClassName($enumeration->type, $interface);
</ins><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
</span><span class="cx"> $result .= GenerateEnumerationImplementationContent($enumeration, $className, $interface, $conditionalString);
</span><span class="cx"> }
</span><span class="lines">@@ -1036,7 +1017,7 @@
</span><span class="cx">
</span><span class="cx"> my $result = "";
</span><span class="cx"> foreach my $enumeration (@$enumerations) {
</span><del>- my $className = GetEnumerationClassName($enumeration->name, $interface);
</del><ins>+ my $className = GetEnumerationClassName($enumeration->type, $interface);
</ins><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
</span><span class="cx"> $result .= GenerateEnumerationHeaderContent($enumeration, $className, $conditionalString);
</span><span class="cx"> }
</span><span class="lines">@@ -1045,13 +1026,14 @@
</span><span class="cx">
</span><span class="cx"> sub GetDictionaryClassName
</span><span class="cx"> {
</span><del>- my ($name, $interface) = @_;
</del><ins>+ my ($type, $interface) = @_;
</ins><span class="cx">
</span><del>- if ($codeGenerator->HasDictionaryImplementationNameOverride($name)) {
- return $codeGenerator->GetDictionaryImplementationNameOverride($name);
</del><ins>+ if ($codeGenerator->HasDictionaryImplementationNameOverride($type)) {
+ return $codeGenerator->GetDictionaryImplementationNameOverride($type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return $name if $codeGenerator->IsExternalDictionaryType($name);
</del><ins>+ my $name = $type->name;
+ return $name if $codeGenerator->IsExternalDictionaryType($type);
</ins><span class="cx"> return $name unless defined($interface);
</span><span class="cx"> return GetNestedClassName($interface, $name);
</span><span class="cx"> }
</span><span class="lines">@@ -1062,10 +1044,10 @@
</span><span class="cx">
</span><span class="cx"> my $defaultValue = $signature->default;
</span><span class="cx">
</span><del>- if ($codeGenerator->IsEnumType($signature->type)) {
</del><ins>+ if ($codeGenerator->IsEnumType($signature->idlType)) {
</ins><span class="cx"> # FIXME: Would be nice to report an error if the value does not have quote marks around it.
</span><span class="cx"> # FIXME: Would be nice to report an error if the value is not one of the enumeration values.
</span><del>- my $className = GetEnumerationClassName($signature->type, $interface);
</del><ins>+ my $className = GetEnumerationClassName($signature->idlType, $interface);
</ins><span class="cx"> my $enumerationValueName = GetEnumerationValueName(substr($defaultValue, 1, -1));
</span><span class="cx"> return $className . "::" . $enumerationValueName;
</span><span class="cx"> }
</span><span class="lines">@@ -1076,9 +1058,9 @@
</span><span class="cx"> my $IDLType = GetIDLType($interface, $signature->idlType);
</span><span class="cx"> return "convert<${IDLType}>(state, jsNull());";
</span><span class="cx"> }
</span><del>- return "jsNull()" if $signature->type eq "any";
- return "nullptr" if $codeGenerator->IsWrapperType($signature->type) || $codeGenerator->IsTypedArrayType($signature->type);
- return "String()" if $codeGenerator->IsStringType($signature->type);
</del><ins>+ return "jsNull()" if $signature->idlType->name eq "any";
+ return "nullptr" if $codeGenerator->IsWrapperType($signature->idlType) || $codeGenerator->IsTypedArrayType($signature->idlType);
+ return "String()" if $codeGenerator->IsStringType($signature->idlType);
</ins><span class="cx"> return "Nullopt";
</span><span class="cx"> }
</span><span class="cx"> if ($defaultValue eq "[]") {
</span><span class="lines">@@ -1092,25 +1074,6 @@
</span><span class="cx"> return $defaultValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub ShouldAllowNonFiniteForFloatingPointType
-{
- my $type = shift;
-
- die "Can only be called with floating point types" unless $codeGenerator->IsFloatingPointType($type);
- return $type eq "unrestricted double" || $type eq "unrestricted float";
-}
-
-sub GenerateConversionRuleWithLeadingComma
-{
- my ($interface, $member) = @_;
-
- if ($codeGenerator->IsFloatingPointType($member->type)) {
- return ", " . (ShouldAllowNonFiniteForFloatingPointType($member->type) ? "ShouldAllowNonFinite::Yes" : "ShouldAllowNonFinite::No");
- }
- return ", " . GetIntegerConversionConfiguration($member) if $codeGenerator->IsIntegerType($member->type);
- return "";
-}
-
</del><span class="cx"> sub GenerateDictionaryHeaderContent
</span><span class="cx"> {
</span><span class="cx"> my ($dictionary, $className, $conditionalString) = @_;
</span><span class="lines">@@ -1133,7 +1096,7 @@
</span><span class="cx"> my $result = "";
</span><span class="cx"> foreach my $dictionary (@$allDictionaries) {
</span><span class="cx"> $headerIncludes{$interface->name . ".h"} = 1;
</span><del>- my $className = GetDictionaryClassName($dictionary->name, $interface);
</del><ins>+ my $className = GetDictionaryClassName($dictionary->type, $interface);
</ins><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
</span><span class="cx"> $result .= GenerateDictionaryHeaderContent($dictionary, $className, $conditionalString);
</span><span class="cx"> }
</span><span class="lines">@@ -1178,12 +1141,12 @@
</span><span class="cx"> # 4. Let dictionaries be a list consisting of D and all of D’s inherited dictionaries, in order from least to most derived.
</span><span class="cx"> my @dictionaries;
</span><span class="cx"> push(@dictionaries, $dictionary);
</span><del>- my $parentName = $dictionary->parent;
- while (defined($parentName)) {
- my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
- assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless defined($parentDictionary);
</del><ins>+ my $parentType = $dictionary->parentType;
+ while (defined($parentType)) {
+ my $parentDictionary = $codeGenerator->GetDictionaryByType($parentType);
+ assert("Unable to find definition for dictionary named '" . $parentType->name . "'!") unless defined($parentDictionary);
</ins><span class="cx"> unshift(@dictionaries, $parentDictionary);
</span><del>- $parentName = $parentDictionary->parent;
</del><ins>+ $parentType = $parentDictionary->parentType;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $arguments = "";
</span><span class="lines">@@ -1244,7 +1207,7 @@
</span><span class="cx">
</span><span class="cx"> my $result = "";
</span><span class="cx"> foreach my $dictionary (@$allDictionaries) {
</span><del>- my $className = GetDictionaryClassName($dictionary->name, $interface);
</del><ins>+ my $className = GetDictionaryClassName($dictionary->type, $interface);
</ins><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
</span><span class="cx"> $result .= GenerateDictionaryImplementationContent($dictionary, $className, $interface, $conditionalString);
</span><span class="cx"> }
</span><span class="lines">@@ -1317,8 +1280,8 @@
</span><span class="cx">
</span><span class="cx"> $headerIncludes{"SVGElement.h"} = 1 if $className =~ /^JSSVG/;
</span><span class="cx">
</span><del>- my $implType = GetImplClassName($interfaceName);
- my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
</del><ins>+ my $implType = GetImplClassName($interface);
+ my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
</ins><span class="cx"> my $svgPropertyOrListPropertyType;
</span><span class="cx"> $svgPropertyOrListPropertyType = $svgPropertyType if $svgPropertyType;
</span><span class="cx"> $svgPropertyOrListPropertyType = $svgListPropertyType if $svgListPropertyType;
</span><span class="lines">@@ -1329,16 +1292,16 @@
</span><span class="cx">
</span><span class="cx"> push(@headerContent, "\nnamespace WebCore {\n\n");
</span><span class="cx">
</span><del>- if ($codeGenerator->IsSVGAnimatedType($interfaceName)) {
</del><ins>+ if ($codeGenerator->IsSVGAnimatedType($interface->type)) {
</ins><span class="cx"> $headerIncludes{"$interfaceName.h"} = 1;
</span><span class="cx"> } else {
</span><span class="cx"> # Implementation class forward declaration
</span><span class="cx"> if (IsDOMGlobalObject($interface)) {
</span><del>- AddClassForwardIfNeeded($interfaceName) unless $svgPropertyOrListPropertyType;
</del><ins>+ AddClassForwardIfNeeded($interface->type) unless $svgPropertyOrListPropertyType;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AddClassForwardIfNeeded("JSDOMWindowShell") if $interfaceName eq "DOMWindow";
</del><ins>+ push(@headerContent, "class JSDOMWindowShell;\n\n") if $interfaceName eq "DOMWindow";
</ins><span class="cx">
</span><span class="cx"> my $exportMacro = GetExportMacroForJSClass($interface);
</span><span class="cx">
</span><span class="lines">@@ -1367,7 +1330,7 @@
</span><span class="cx"> push(@headerContent, " return ptr;\n");
</span><span class="cx"> push(@headerContent, " }\n\n");
</span><span class="cx"> } elsif ($interface->extendedAttributes->{MasqueradesAsUndefined}) {
</span><del>- AddIncludesForTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
</del><ins>+ AddIncludesForImplementationTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
</ins><span class="cx"> push(@headerContent, " static $className* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<$implType>&& impl)\n");
</span><span class="cx"> push(@headerContent, " {\n");
</span><span class="cx"> push(@headerContent, " globalObject->masqueradesAsUndefinedWatchpoint()->fireAll(globalObject->vm(), \"Allocated masquerading object\");\n");
</span><span class="lines">@@ -1383,7 +1346,7 @@
</span><span class="cx"> push(@headerContent, " return ptr;\n");
</span><span class="cx"> push(@headerContent, " }\n\n");
</span><span class="cx"> } else {
</span><del>- AddIncludesForTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
</del><ins>+ AddIncludesForImplementationTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
</ins><span class="cx"> push(@headerContent, " static $className* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<$implType>&& impl)\n");
</span><span class="cx"> push(@headerContent, " {\n");
</span><span class="cx"> push(@headerContent, " $className* ptr = new (NotNull, JSC::allocateCell<$className>(globalObject->vm().heap)) $className(structure, *globalObject, WTFMove(impl));\n");
</span><span class="lines">@@ -1404,7 +1367,7 @@
</span><span class="cx">
</span><span class="cx"> # JSValue to implementation type
</span><span class="cx"> if (ShouldGenerateToWrapped($hasParent, $interface)) {
</span><del>- my $nativeType = GetNativeType($interface, $implType);
</del><ins>+ my $nativeType = GetNativeType($interface, $interface->type);
</ins><span class="cx"> if ($interface->name eq "XPathNSResolver") {
</span><span class="cx"> push(@headerContent, " static $nativeType toWrapped(JSC::ExecState&, JSC::JSValue);\n");
</span><span class="cx"> } else {
</span><span class="lines">@@ -1818,12 +1781,12 @@
</span><span class="cx"> push(@ancestors, $currentInterface->name);
</span><span class="cx"> }, 0);
</span><span class="cx"> for my $dictionary (@$dictionaries) {
</span><del>- my $parentName = $dictionary->parent;
- while (defined($parentName)) {
- push(@ancestors, $parentName) if $codeGenerator->IsExternalDictionaryType($parentName);
- my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
- assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless defined($parentDictionary);
- $parentName = $parentDictionary->parent;
</del><ins>+ my $parentType = $dictionary->parentType;
+ while (defined($parentType)) {
+ push(@ancestors, $parentType->name) if $codeGenerator->IsExternalDictionaryType($parentType);
+ my $parentDictionary = $codeGenerator->GetDictionaryByType($parentType);
+ assert("Unable to find definition for dictionary named '" . $parentType->name . "'!") unless defined($parentDictionary);
+ $parentType = $parentDictionary->parentType;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> push(@depsContent, "$className.h : ", join(" ", map { "$_.idl" } @ancestors), "\n");
</span><span class="lines">@@ -2032,7 +1995,7 @@
</span><span class="cx">
</span><span class="cx"> my $isDictionary = sub {
</span><span class="cx"> my $type = shift;
</span><del>- return $type eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
</del><ins>+ return $type->name eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
</ins><span class="cx"> };
</span><span class="cx"> my $isCallbackFunctionOrDictionary = sub {
</span><span class="cx"> my $type = shift;
</span><span class="lines">@@ -2060,12 +2023,12 @@
</span><span class="cx">
</span><span class="cx"> return 0 if $idlTypeA->name eq $idlTypeB->name;
</span><span class="cx"> return 0 if $idlTypeA->name eq "object" or $idlTypeB->name eq "object";
</span><del>- return 0 if $codeGenerator->IsNumericType($idlTypeA->name) && $codeGenerator->IsNumericType($idlTypeB->name);
- return 0 if $codeGenerator->IsStringOrEnumType($idlTypeA->name) && $codeGenerator->IsStringOrEnumType($idlTypeB->name);
- return 0 if &$isDictionary($idlTypeA->name) && &$isDictionary($idlTypeB->name);
- return 0 if $codeGenerator->IsCallbackInterface($idlTypeA->name) && $codeGenerator->IsCallbackInterface($idlTypeB->name);
- return 0 if &$isCallbackFunctionOrDictionary($idlTypeA->name) && &$isCallbackFunctionOrDictionary($idlTypeB->name);
- return 0 if $codeGenerator->IsSequenceOrFrozenArrayType($idlTypeA->name) && $codeGenerator->IsSequenceOrFrozenArrayType($idlTypeB->name);
</del><ins>+ return 0 if $codeGenerator->IsNumericType($idlTypeA) && $codeGenerator->IsNumericType($idlTypeB);
+ return 0 if $codeGenerator->IsStringOrEnumType($idlTypeA) && $codeGenerator->IsStringOrEnumType($idlTypeB);
+ return 0 if &$isDictionary($idlTypeA) && &$isDictionary($idlTypeB);
+ return 0 if $codeGenerator->IsCallbackInterface($idlTypeA) && $codeGenerator->IsCallbackInterface($idlTypeB);
+ return 0 if &$isCallbackFunctionOrDictionary($idlTypeA) && &$isCallbackFunctionOrDictionary($idlTypeB);
+ return 0 if $codeGenerator->IsSequenceOrFrozenArrayType($idlTypeA) && $codeGenerator->IsSequenceOrFrozenArrayType($idlTypeB);
</ins><span class="cx"> # FIXME: return 0 if $idlTypeA and $idlTypeB are both exception types.
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -2162,7 +2125,7 @@
</span><span class="cx"> };
</span><span class="cx"> my $isDictionaryParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><del>- return $idlType->name eq "Dictionary" || $codeGenerator->IsDictionaryType($idlType->name);
</del><ins>+ return $idlType->name eq "Dictionary" || $codeGenerator->IsDictionaryType($idlType);
</ins><span class="cx"> };
</span><span class="cx"> my $isNullableOrDictionaryParameterOrUnionContainingOne = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><span class="lines">@@ -2191,17 +2154,17 @@
</span><span class="cx"> };
</span><span class="cx"> my $isObjectOrCallbackFunctionParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><del>- return $idlType->name eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($idlType->name);
</del><ins>+ return $idlType->name eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($idlType);
</ins><span class="cx"> };
</span><span class="cx"> my $isSequenceOrFrozenArrayParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><del>- return $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
</del><ins>+ return $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
</ins><span class="cx"> };
</span><span class="cx"> my $isDictionaryOrObjectOrCallbackInterfaceParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><span class="cx"> return 1 if &$isDictionaryParameter($idlType, $optionality);
</span><span class="cx"> return 1 if $idlType->name eq "object";
</span><del>- return 1 if $codeGenerator->IsCallbackInterface($idlType->name) && !$codeGenerator->IsFunctionOnlyCallbackInterface($idlType->name);
</del><ins>+ return 1 if $codeGenerator->IsCallbackInterface($idlType) && !$codeGenerator->IsFunctionOnlyCallbackInterface($idlType);
</ins><span class="cx"> return 0;
</span><span class="cx"> };
</span><span class="cx"> my $isBooleanParameter = sub {
</span><span class="lines">@@ -2210,11 +2173,11 @@
</span><span class="cx"> };
</span><span class="cx"> my $isNumericParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><del>- return $codeGenerator->IsNumericType($idlType->name);
</del><ins>+ return $codeGenerator->IsNumericType($idlType);
</ins><span class="cx"> };
</span><span class="cx"> my $isStringOrEnumParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><del>- return $codeGenerator->IsStringOrEnumType($idlType->name);
</del><ins>+ return $codeGenerator->IsStringOrEnumType($idlType);
</ins><span class="cx"> };
</span><span class="cx"> my $isAnyParameter = sub {
</span><span class="cx"> my ($idlType, $optionality) = @_;
</span><span class="lines">@@ -2260,13 +2223,12 @@
</span><span class="cx">
</span><span class="cx"> my @idlSubtypes = $idlType->isUnion ? GetFlattenedMemberTypes($idlType) : ( $idlType );
</span><span class="cx"> for my $idlSubtype (@idlSubtypes) {
</span><del>- my $type = $idlSubtype->name;
- if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type)) {
- if ($type eq "DOMWindow") {
</del><ins>+ if ($codeGenerator->IsWrapperType($idlSubtype) || $codeGenerator->IsTypedArrayType($idlSubtype)) {
+ if ($idlSubtype->name eq "DOMWindow") {
</ins><span class="cx"> AddToImplIncludes("JSDOMWindowShell.h");
</span><span class="cx"> &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && (asObject(distinguishingArg)->inherits(JSDOMWindowShell::info()) || asObject(distinguishingArg)->inherits(JSDOMWindow::info()))");
</span><span class="cx"> } else {
</span><del>- &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS${type}::info())");
</del><ins>+ &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS" . $idlSubtype->name . "::info())");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2367,8 +2329,9 @@
</span><span class="cx"> sub GetNativeTypeForConversions
</span><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span><ins>+
</ins><span class="cx"> my $interfaceName = $interface->name;
</span><del>- $interfaceName = $codeGenerator->GetSVGTypeNeedingTearOff($interfaceName) if $codeGenerator->IsSVGTypeNeedingTearOff($interfaceName);
</del><ins>+ $interfaceName = $codeGenerator->GetSVGTypeNeedingTearOffForType($interface->type) if $codeGenerator->IsSVGTypeNeedingTearOffForType($interface->type);
</ins><span class="cx"> return $interfaceName;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2531,7 +2494,9 @@
</span><span class="cx"> sub GetIndexedGetterExpression
</span><span class="cx"> {
</span><span class="cx"> my $indexedGetterFunction = shift;
</span><del>- return "jsStringOrUndefined(state, thisObject->wrapped().item(index))" if $indexedGetterFunction->signature->type eq "DOMString";
</del><ins>+
+ # FIXME: Should this work for all string types?
+ return "jsStringOrUndefined(state, thisObject->wrapped().item(index))" if $indexedGetterFunction->signature->idlType->name eq "DOMString";
</ins><span class="cx"> return "toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index))";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2615,7 +2580,7 @@
</span><span class="cx"> $implIncludes{"<wtf/GetPtr.h>"} = 1;
</span><span class="cx"> $implIncludes{"<runtime/PropertyNameArray.h>"} = 1 if $indexedGetterFunction;
</span><span class="cx">
</span><del>- my $implType = GetImplClassName($interfaceName);
</del><ins>+ my $implType = GetImplClassName($interface);
</ins><span class="cx">
</span><span class="cx"> AddJSBuiltinIncludesIfNeeded($interface);
</span><span class="cx">
</span><span class="lines">@@ -2922,7 +2887,7 @@
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, ", CREATE_METHOD_TABLE($className) };\n\n");
</span><span class="cx">
</span><del>- my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
</del><ins>+ my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
</ins><span class="cx"> my $svgPropertyOrListPropertyType;
</span><span class="cx"> $svgPropertyOrListPropertyType = $svgPropertyType if $svgPropertyType;
</span><span class="cx"> $svgPropertyOrListPropertyType = $svgListPropertyType if $svgListPropertyType;
</span><span class="lines">@@ -2929,13 +2894,13 @@
</span><span class="cx">
</span><span class="cx"> # Constructor
</span><span class="cx"> if ($interfaceName eq "DOMWindow") {
</span><del>- AddIncludesForTypeInImpl("JSDOMWindowShell");
</del><ins>+ AddIncludesForImplementationTypeInImpl("JSDOMWindowShell");
</ins><span class="cx"> push(@implContent, "${className}::$className(VM& vm, Structure* structure, Ref<$implType>&& impl, JSDOMWindowShell* shell)\n");
</span><span class="cx"> push(@implContent, " : $parentClassName(vm, structure, WTFMove(impl), shell)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> } elsif ($codeGenerator->InheritsInterface($interface, "WorkerGlobalScope")) {
</span><del>- AddIncludesForTypeInImpl($interfaceName);
</del><ins>+ AddIncludesForImplementationTypeInImpl($interfaceName);
</ins><span class="cx"> push(@implContent, "${className}::$className(VM& vm, Structure* structure, Ref<$implType>&& impl)\n");
</span><span class="cx"> push(@implContent, " : $parentClassName(vm, structure, WTFMove(impl))\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="lines">@@ -3079,7 +3044,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if ($indexedGetterFunction) {
</span><del>- if ($indexedGetterFunction->signature->type eq "DOMString") {
</del><ins>+ # FIXME: Should this work for all string types?
+ if ($indexedGetterFunction->signature->idlType->name eq "DOMString") {
</ins><span class="cx"> push(@implContent, " if (LIKELY(index <= MAX_ARRAY_INDEX)) {\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " if (LIKELY(index < thisObject->wrapped().length())) {\n");
</span><span class="lines">@@ -3158,7 +3124,7 @@
</span><span class="cx"> next if IsJSBuiltin($interface, $attribute);
</span><span class="cx">
</span><span class="cx"> my $name = $attribute->signature->name;
</span><del>- my $type = $attribute->signature->type;
</del><ins>+ my $idlType = $attribute->signature->idlType;
</ins><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 $getterMayThrowLegacyException = $attribute->signature->extendedAttributes->{GetterMayThrowLegacyException};
</span><span class="lines">@@ -3168,7 +3134,7 @@
</span><span class="cx"> my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
</span><span class="cx"> push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
</span><span class="cx">
</span><del>- if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
</del><ins>+ if (!$attribute->isStatic || $codeGenerator->IsConstructorType($idlType)) {
</ins><span class="cx"> my $templateParameters = "${getFunctionName}Getter";
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{LenientThis}) {
</span><span class="cx"> $templateParameters .= ", CastedThisErrorBehavior::ReturnEarly";
</span><span class="lines">@@ -3207,7 +3173,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Global constructors can be disabled at runtime.
</span><del>- if ($attribute->signature->type =~ /Constructor$/) {
</del><ins>+ if ($codeGenerator->IsConstructorType($idlType)) {
</ins><span class="cx"> if ($attribute->signature->extendedAttributes->{EnabledBySetting}) {
</span><span class="cx"> AddToImplIncludes("Frame.h");
</span><span class="cx"> AddToImplIncludes("Settings.h");
</span><span class="lines">@@ -3242,8 +3208,8 @@
</span><span class="cx"> push(@implContent, " JSGlobalObject* globalObject = state.lexicalGlobalObject();\n");
</span><span class="cx"> push(@implContent, " InputCursor& cursor = globalObject->inputCursor();\n");
</span><span class="cx">
</span><del>- my $nativeType = GetNativeType($interface, $type);
- my $memoizedType = GetNativeTypeForMemoization($interface, $type);
</del><ins>+ my $nativeType = GetNativeType($interface, $idlType);
+ my $memoizedType = GetNativeTypeForMemoization($interface, $idlType);
</ins><span class="cx"> my $exceptionCode = $getterMayThrowLegacyException ? "ec" : "0";
</span><span class="cx"> push(@implContent, " static NeverDestroyed<const AtomicString> bindingName(\"$interfaceName.$name\", AtomicString::ConstructFromLiteral);\n");
</span><span class="cx"> push(@implContent, " if (cursor.isCapturing()) {\n");
</span><span class="lines">@@ -3273,7 +3239,7 @@
</span><span class="cx"> $implIncludes{"JSDOMBinding.h"} = 1;
</span><span class="cx"> push(@implContent, " auto& impl = thisObject.wrapped();\n");
</span><span class="cx"> push(@implContent, " return shouldAllowAccessToNode(&state, impl." . $attribute->signature->name . "()) ? " . NativeToJSValueUsingReferences($attribute->signature, 0, $interface, "impl.$implGetterFunctionName()", "thisObject") . " : jsNull();\n");
</span><del>- } elsif ($type eq "EventHandler") {
</del><ins>+ } elsif ($idlType->name eq "EventHandler") {
</ins><span class="cx"> $implIncludes{"EventNames.h"} = 1;
</span><span class="cx"> my $getter = $attribute->signature->extendedAttributes->{WindowEventHandler} ? "windowEventHandlerAttribute"
</span><span class="cx"> : $attribute->signature->extendedAttributes->{DocumentEventHandler} ? "documentEventHandlerAttribute"
</span><span class="lines">@@ -3280,8 +3246,8 @@
</span><span class="cx"> : "eventHandlerAttribute";
</span><span class="cx"> my $eventName = EventHandlerAttributeEventName($attribute);
</span><span class="cx"> push(@implContent, " return $getter(thisObject.wrapped(), $eventName);\n");
</span><del>- } elsif ($attribute->signature->type =~ /Constructor$/) {
- my $constructorType = $attribute->signature->type;
</del><ins>+ } elsif ($codeGenerator->IsConstructorType($attribute->signature->idlType)) {
+ my $constructorType = $attribute->signature->idlType->name;
</ins><span class="cx"> $constructorType =~ s/Constructor$//;
</span><span class="cx"> # When Constructor attribute is used by DOMWindow.idl, it's correct to pass thisObject as the global object
</span><span class="cx"> # When JSDOMWrappers have a back-pointer to the globalObject we can pass thisObject->globalObject()
</span><span class="lines">@@ -3330,7 +3296,7 @@
</span><span class="cx"> unshift(@arguments, @callWithArgs);
</span><span class="cx"> my $jsType = NativeToJSValueUsingReferences($attribute->signature, 0, $interface, "${functionName}(" . join(", ", @arguments) . ")", "thisObject");
</span><span class="cx"> push(@implContent, " auto& impl = thisObject.wrapped();\n") if !$attribute->isStatic;
</span><del>- if ($codeGenerator->IsSVGAnimatedType($type)) {
</del><ins>+ if ($codeGenerator->IsSVGAnimatedType($idlType)) {
</ins><span class="cx"> push(@implContent, " auto obj = $jsType;\n");
</span><span class="cx"> push(@implContent, " JSValue result = toJS(&state, thisObject.globalObject(), obj.get());\n");
</span><span class="cx"> } else {
</span><span class="lines">@@ -3478,7 +3444,7 @@
</span><span class="cx"> next if IsJSBuiltin($interface, $attribute);
</span><span class="cx">
</span><span class="cx"> my $name = $attribute->signature->name;
</span><del>- my $type = $attribute->signature->type;
</del><ins>+ my $idlType = $attribute->signature->idlType;
</ins><span class="cx"> my $putFunctionName = GetAttributeSetterName($interface, $className, $attribute);
</span><span class="cx"> my $implSetterFunctionName = $codeGenerator->WK_ucfirst($name);
</span><span class="cx"> my $setterMayThrowLegacyException = $attribute->signature->extendedAttributes->{SetterMayThrowLegacyException};
</span><span class="lines">@@ -3532,7 +3498,7 @@
</span><span class="cx"> if (HasCustomSetter($attribute->signature->extendedAttributes)) {
</span><span class="cx"> push(@implContent, " thisObject.set$implSetterFunctionName(state, value);\n");
</span><span class="cx"> push(@implContent, " return true;\n");
</span><del>- } elsif ($type eq "EventHandler") {
</del><ins>+ } elsif ($idlType->name eq "EventHandler") {
</ins><span class="cx"> $implIncludes{"JSEventListener.h"} = 1;
</span><span class="cx"> my $eventName = EventHandlerAttributeEventName($attribute);
</span><span class="cx"> # FIXME: Find a way to do this special case without hardcoding the class and attribute names here.
</span><span class="lines">@@ -3547,8 +3513,8 @@
</span><span class="cx"> push(@implContent, " $setter(state, thisObject, thisObject.wrapped(), $eventName, value);\n");
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " return true;\n");
</span><del>- } elsif ($type =~ /Constructor$/) {
- my $constructorType = $type;
</del><ins>+ } elsif ($codeGenerator->IsConstructorType($idlType)) {
+ my $constructorType = $idlType->name;
</ins><span class="cx"> $constructorType =~ s/Constructor$//;
</span><span class="cx"> # $constructorType ~= /Constructor$/ indicates that it is NamedConstructor.
</span><span class="cx"> # We do not generate the header file for NamedConstructor of class XXXX,
</span><span class="lines">@@ -3570,7 +3536,7 @@
</span><span class="cx"> my $putForwards = $attribute->signature->extendedAttributes->{PutForwards};
</span><span class="cx"> if ($putForwards) {
</span><span class="cx"> my $implGetterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->extendedAttributes->{ImplementedAs} || $name);
</span><del>- my $forwardedAttribute = $codeGenerator->GetAttributeFromInterface($interface, $type, $putForwards);
</del><ins>+ my $forwardedAttribute = $codeGenerator->GetAttributeFromInterface($interface, $idlType->name, $putForwards);
</ins><span class="cx">
</span><span class="cx"> if ($forwardedAttribute->signature->extendedAttributes->{CEReactions}) {
</span><span class="cx"> push(@implContent, "#if ENABLE(CUSTOM_ELEMENTS)\n");
</span><span class="lines">@@ -3579,18 +3545,19 @@
</span><span class="cx"> $implIncludes{"CustomElementReactionQueue.h"} = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ my $typeName = $idlType->name;
</ins><span class="cx"> if ($attribute->signature->isNullable) {
</span><del>- push(@implContent, " RefPtr<${type}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
</del><ins>+ push(@implContent, " RefPtr<${typeName}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
</ins><span class="cx"> push(@implContent, " if (!forwardedImpl)\n");
</span><span class="cx"> push(@implContent, " return false;\n");
</span><span class="cx"> push(@implContent, " auto& impl = *forwardedImpl;\n");
</span><span class="cx"> } else {
</span><span class="cx"> # Attribute is not nullable, the implementation is expected to return a reference.
</span><del>- push(@implContent, " Ref<${type}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
</del><ins>+ push(@implContent, " Ref<${typeName}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
</ins><span class="cx"> push(@implContent, " auto& impl = forwardedImpl.get();\n");
</span><span class="cx"> }
</span><span class="cx"> $attribute = $forwardedAttribute;
</span><del>- $type = $attribute->signature->type;
</del><ins>+ $idlType = $attribute->signature->idlType;
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " auto& impl = thisObject.wrapped();\n");
</span><span class="cx"> }
</span><span class="lines">@@ -3601,7 +3568,7 @@
</span><span class="cx"> my $shouldPassByReference = ShouldPassWrapperByReference($attribute->signature, $interface);
</span><span class="cx">
</span><span class="cx"> my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $attribute->signature, "value", $attribute->signature->extendedAttributes->{Conditional}, "&state", "state", "thisObject");
</span><del>- if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
</del><ins>+ if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsTypedArrayType($idlType))) {
</ins><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx"> push(@implContent, " " . GetNativeTypeFromSignature($interface, $attribute->signature) . " nativeValue = nullptr;\n");
</span><span class="cx"> push(@implContent, " if (!value.isUndefinedOrNull()) {\n");
</span><span class="lines">@@ -3608,7 +3575,7 @@
</span><span class="cx"> push(@implContent, " nativeValue = $nativeValue;\n");
</span><span class="cx"> push(@implContent, " RETURN_IF_EXCEPTION(throwScope, false);\n") if $mayThrowException;
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!nativeValue)) {\n");
</span><del>- push(@implContent, " throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"$type\");\n");
</del><ins>+ push(@implContent, " throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"" . $idlType->name . "\");\n");
</ins><span class="cx"> push(@implContent, " return false;\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="lines">@@ -3617,7 +3584,7 @@
</span><span class="cx"> push(@implContent, " RETURN_IF_EXCEPTION(throwScope, false);\n") if $mayThrowException;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsEnumType($type)) {
</del><ins>+ if ($codeGenerator->IsEnumType($idlType)) {
</ins><span class="cx"> push (@implContent, " if (UNLIKELY(!nativeValue))\n");
</span><span class="cx"> push (@implContent, " return false;\n");
</span><span class="cx"> }
</span><span class="lines">@@ -3624,7 +3591,7 @@
</span><span class="cx">
</span><span class="cx"> if ($shouldPassByReference) {
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!nativeValue)) {\n");
</span><del>- push(@implContent, " throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"$type\");\n");
</del><ins>+ push(@implContent, " throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"" . $idlType->name . "\");\n");
</ins><span class="cx"> push(@implContent, " return false;\n");
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> }
</span><span class="lines">@@ -3660,9 +3627,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
</span><span class="cx">
</span><del>- if ($codeGenerator->IsTypedArrayType($type) and not $type eq "ArrayBuffer") {
</del><ins>+ if ($codeGenerator->IsTypedArrayType($idlType) and not $idlType->name eq "ArrayBuffer") {
</ins><span class="cx"> push(@arguments, "nativeValue.get()");
</span><del>- } elsif ($codeGenerator->IsEnumType($type)) {
</del><ins>+ } elsif ($codeGenerator->IsEnumType($idlType)) {
</ins><span class="cx"> push(@arguments, "nativeValue.value()");
</span><span class="cx"> } else {
</span><span class="cx"> push(@arguments, $shouldPassByReference ? "*nativeValue" : "WTFMove(nativeValue)");
</span><span class="lines">@@ -3751,7 +3718,7 @@
</span><span class="cx">
</span><span class="cx"> next if $isCustom && $isOverloaded && $function->{overloadIndex} > 1;
</span><span class="cx">
</span><del>- AddIncludesForTypeInImpl($function->signature->type) unless $isCustom or IsReturningPromise($function);
</del><ins>+ AddToImplIncludesForIDLType($function->signature->idlType) unless $isCustom or IsReturningPromise($function);
</ins><span class="cx">
</span><span class="cx"> my $functionName = GetFunctionName($interface, $className, $function);
</span><span class="cx">
</span><span class="lines">@@ -3949,7 +3916,8 @@
</span><span class="cx"> # die "Can't generate binding for class with cached attribute and custom mark." if $numCachedAttributes > 0 and $interface->extendedAttributes->{JSCustomMarkFunction};
</span><span class="cx">
</span><span class="cx"> if ($indexedGetterFunction) {
</span><del>- $implIncludes{"URL.h"} = 1 if $indexedGetterFunction->signature->type eq "DOMString";
</del><ins>+ # FIXME: Should this work for all string types.
+ $implIncludes{"URL.h"} = 1 if $indexedGetterFunction->signature->idlType->name eq "DOMString";
</ins><span class="cx"> if ($interfaceName =~ /^HTML\w*Collection$/ or $interfaceName eq "RadioNodeList") {
</span><span class="cx"> $implIncludes{"JSNode.h"} = 1;
</span><span class="cx"> $implIncludes{"Node.h"} = 1;
</span><span class="lines">@@ -4300,10 +4268,9 @@
</span><span class="cx">
</span><span class="cx"> sub WillConvertUndefinedToDefaultParameterValue
</span><span class="cx"> {
</span><del>- my $parameterType = shift;
- my $defaultValue = shift;
</del><ins>+ my ($parameterType, $defaultValue) = @_;
</ins><span class="cx">
</span><del>- my $automaticallyGeneratedDefaultValue = $automaticallyGeneratedDefaultValues{$parameterType};
</del><ins>+ my $automaticallyGeneratedDefaultValue = $automaticallyGeneratedDefaultValues{$parameterType->name};
</ins><span class="cx"> return 1 if defined $automaticallyGeneratedDefaultValue && $automaticallyGeneratedDefaultValue eq $defaultValue;
</span><span class="cx">
</span><span class="cx"> return 1 if $defaultValue eq "null" && $codeGenerator->IsWrapperType($parameterType);
</span><span class="lines">@@ -4349,21 +4316,20 @@
</span><span class="cx">
</span><span class="cx"> my $argumentIndex = 0;
</span><span class="cx"> foreach my $parameter (@{$function->parameters}) {
</span><del>- my $type = $parameter->type;
</del><span class="cx"> my $idlType = $parameter->idlType;
</span><span class="cx">
</span><del>- die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($type);
</del><ins>+ die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($idlType);
</ins><span class="cx"> die "Optional parameters preceding variadic parameters are not supported" if ($parameter->isOptional && @{$function->parameters}[$numParameters - 1]->isVariadic);
</span><span class="cx">
</span><span class="cx"> if ($parameter->isOptional && !defined($parameter->default)) {
</span><span class="cx"> # As per Web IDL, optional dictionary parameters are always considered to have a default value of an empty dictionary, unless otherwise specified.
</span><del>- $parameter->default("[]") if $type eq "Dictionary" or $codeGenerator->IsDictionaryType($type);
</del><ins>+ $parameter->default("[]") if $idlType->name eq "Dictionary" or $codeGenerator->IsDictionaryType($idlType);
</ins><span class="cx">
</span><span class="cx"> # We use undefined as default value for optional parameters of type 'any' unless specified otherwise.
</span><del>- $parameter->default("undefined") if $type eq "any";
</del><ins>+ $parameter->default("undefined") if $idlType->name eq "any";
</ins><span class="cx">
</span><span class="cx"> # We use the null string as default value for parameters of type DOMString unless specified otherwise.
</span><del>- $parameter->default("null") if $codeGenerator->IsStringType($type);
</del><ins>+ $parameter->default("null") if $codeGenerator->IsStringType($idlType);
</ins><span class="cx">
</span><span class="cx"> # As per Web IDL, passing undefined for a nullable parameter is treated as null. Therefore, use null as
</span><span class="cx"> # default value for nullable parameters unless otherwise specified.
</span><span class="lines">@@ -4370,19 +4336,20 @@
</span><span class="cx"> $parameter->default("null") if $parameter->isNullable;
</span><span class="cx">
</span><span class="cx"> # For callback parameters, the generated bindings treat undefined as null, so use null as implicit default value.
</span><del>- $parameter->default("null") if $codeGenerator->IsCallbackInterface($type);
</del><ins>+ $parameter->default("null") if $codeGenerator->IsCallbackInterface($idlType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $name = $parameter->name;
</span><span class="cx"> my $value = $name;
</span><span class="cx">
</span><del>- if ($codeGenerator->IsCallbackInterface($type)) {
- my $callbackClassName = GetCallbackClassName($type);
</del><ins>+ if ($codeGenerator->IsCallbackInterface($idlType)) {
+ my $callbackClassName = GetCallbackClassName($idlType->name);
+ my $typeName = $idlType->name;
</ins><span class="cx"> $implIncludes{"$callbackClassName.h"} = 1;
</span><span class="cx"> if ($parameter->isOptional) {
</span><del>- push(@$outputArray, " RefPtr<$type> $name;\n");
</del><ins>+ push(@$outputArray, " RefPtr<$typeName> $name;\n");
</ins><span class="cx"> push(@$outputArray, " if (!state->argument($argumentIndex).isUndefinedOrNull()) {\n");
</span><del>- if ($codeGenerator->IsFunctionOnlyCallbackInterface($type)) {
</del><ins>+ if ($codeGenerator->IsFunctionOnlyCallbackInterface($idlType)) {
</ins><span class="cx"> push(@$outputArray, " if (!state->uncheckedArgument($argumentIndex).isFunction())\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@$outputArray, " if (!state->uncheckedArgument($argumentIndex).isObject())\n");
</span><span class="lines">@@ -4397,7 +4364,7 @@
</span><span class="cx"> push(@$outputArray, " }\n");
</span><span class="cx"> } else {
</span><span class="cx"> die "CallbackInterface does not support Variadic parameter" if $parameter->isVariadic;
</span><del>- if ($codeGenerator->IsFunctionOnlyCallbackInterface($type)) {
</del><ins>+ if ($codeGenerator->IsFunctionOnlyCallbackInterface($idlType)) {
</ins><span class="cx"> push(@$outputArray, " if (UNLIKELY(!state->uncheckedArgument($argumentIndex).isFunction()))\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@$outputArray, " if (UNLIKELY(!state->uncheckedArgument($argumentIndex).isObject()))\n");
</span><span class="lines">@@ -4421,8 +4388,8 @@
</span><span class="cx">
</span><span class="cx"> $value = "WTFMove($name.arguments.value())";
</span><span class="cx">
</span><del>- } elsif ($codeGenerator->IsEnumType($type)) {
- my $className = GetEnumerationClassName($type, $interface);
</del><ins>+ } elsif ($codeGenerator->IsEnumType($idlType)) {
+ my $className = GetEnumerationClassName($idlType, $interface);
</ins><span class="cx">
</span><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx">
</span><span class="lines">@@ -4454,7 +4421,7 @@
</span><span class="cx"> $indent = " ";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $implIncludes{"JS$className.h"} = 1 if $codeGenerator->IsExternalEnumType($type);
</del><ins>+ $implIncludes{"JS$className.h"} = 1 if $codeGenerator->IsExternalEnumType($idlType);
</ins><span class="cx"> push(@$outputArray, "$indent $defineOptionalValue = parseEnumeration<$className>(*state, ${name}Value);\n");
</span><span class="cx"> push(@$outputArray, "$indent RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
</span><span class="cx"> push(@$outputArray, "$indent if (UNLIKELY(!$optionalValue))\n");
</span><span class="lines">@@ -4466,13 +4433,13 @@
</span><span class="cx"> my $outer;
</span><span class="cx"> my $inner;
</span><span class="cx"> my $nativeType = GetNativeTypeFromSignature($interface, $parameter);
</span><del>- my $isTearOff = $codeGenerator->IsSVGTypeNeedingTearOff($type) && $interfaceName !~ /List$/;
</del><ins>+ my $isTearOff = $codeGenerator->IsSVGTypeNeedingTearOffForType($idlType) && $interfaceName !~ /List$/;
</ins><span class="cx"> my $shouldPassByReference = $isTearOff || ShouldPassWrapperByReference($parameter, $interface);
</span><span class="cx">
</span><span class="cx"> die "Variadic parameter is already handled here" if $parameter->isVariadic;
</span><span class="cx"> my $argumentLookupMethod = $parameter->isOptional ? "argument" : "uncheckedArgument";
</span><span class="cx">
</span><del>- if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
</del><ins>+ if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsTypedArrayType($idlType))) {
</ins><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx"> my $checkedArgument = "state->$argumentLookupMethod($argumentIndex)";
</span><span class="cx"> my $uncheckedArgument = "state->uncheckedArgument($argumentIndex)";
</span><span class="lines">@@ -4482,15 +4449,15 @@
</span><span class="cx"> push(@$outputArray, " $name = $nativeValue;\n");
</span><span class="cx"> push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
</span><span class="cx"> push(@$outputArray, " if (UNLIKELY(!$name))\n");
</span><del>- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
</del><ins>+ push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $idlType->name . "\");\n");
</ins><span class="cx"> push(@$outputArray, " }\n");
</span><span class="cx"> $value = "WTFMove($name)";
</span><span class="cx"> } else {
</span><del>- if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($type, $parameter->default)) {
</del><ins>+ if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($idlType, $parameter->default)) {
</ins><span class="cx"> my $defaultValue = $parameter->default;
</span><span class="cx">
</span><span class="cx"> # String-related optimizations.
</span><del>- if ($codeGenerator->IsStringType($type)) {
</del><ins>+ if ($codeGenerator->IsStringType($idlType)) {
</ins><span class="cx"> my $useAtomicString = $parameter->extendedAttributes->{AtomicString};
</span><span class="cx"> if ($defaultValue eq "null") {
</span><span class="cx"> $defaultValue = $useAtomicString ? "nullAtom" : "String()";
</span><span class="lines">@@ -4522,13 +4489,13 @@
</span><span class="cx">
</span><span class="cx"> if ($shouldPassByReference) {
</span><span class="cx"> push(@$outputArray, " if (UNLIKELY(!$name))\n");
</span><del>- push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
</del><ins>+ push(@$outputArray, " return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $idlType->name . "\");\n");
</ins><span class="cx"> $value = $isTearOff ? "$name->propertyReference()" : "*$name";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($codeGenerator->IsTypedArrayType($type) and $parameter->type ne "ArrayBuffer") {
</del><ins>+ if ($codeGenerator->IsTypedArrayType($idlType) and $idlType->name ne "ArrayBuffer") {
</ins><span class="cx"> $value = $shouldPassByReference ? "$name.releaseNonNull()" : "WTFMove($name)";
</span><del>- } elsif ($codeGenerator->IsDictionaryType($type)) {
</del><ins>+ } elsif ($codeGenerator->IsDictionaryType($idlType)) {
</ins><span class="cx"> $value = "WTFMove($name)";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4539,7 +4506,7 @@
</span><span class="cx">
</span><span class="cx"> push @arguments, GenerateReturnParameters($function);
</span><span class="cx"> my $functionString = "$functionName(" . join(", ", @arguments) . ")";
</span><del>- $functionString = "propagateException(*state, throwScope, $functionString)" if $function->signature->type && $function->signature->type eq "void" && $function->signature->extendedAttributes->{MayThrowException};
</del><ins>+ $functionString = "propagateException(*state, throwScope, $functionString)" if $function->signature->idlType && $function->signature->idlType->name eq "void" && $function->signature->extendedAttributes->{MayThrowException};
</ins><span class="cx">
</span><span class="cx"> return ($functionString, scalar @arguments);
</span><span class="cx"> }
</span><span class="lines">@@ -4558,8 +4525,6 @@
</span><span class="cx"> {
</span><span class="cx"> my ($object, $dictionary, $className, $enumerations) = @_;
</span><span class="cx">
</span><del>- my $dictionaryName = $dictionary->name;
-
</del><span class="cx"> # - Add default header template and header protection.
</span><span class="cx"> push(@headerContentHeader, GenerateHeaderContentHeader($dictionary));
</span><span class="cx">
</span><span class="lines">@@ -4577,12 +4542,12 @@
</span><span class="cx"> # - Generate dependencies.
</span><span class="cx"> if ($writeDependencies) {
</span><span class="cx"> my @ancestors;
</span><del>- my $parentName = $dictionary->parent;
- while (defined($parentName)) {
- push(@ancestors, $parentName) if $codeGenerator->IsExternalDictionaryType($parentName);
- my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
- assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless $parentDictionary;
- $parentName = $parentDictionary->parent;
</del><ins>+ my $parentType = $dictionary->parentType;
+ while (defined($parentType)) {
+ push(@ancestors, $parentType->name) if $codeGenerator->IsExternalDictionaryType($parentType);
+ my $parentDictionary = $codeGenerator->GetDictionaryByType($parentType);
+ assert("Unable to find definition for dictionary named '" . $parentType->name . "'!") unless $parentDictionary;
+ $parentType = $parentDictionary->parentType;
</ins><span class="cx"> }
</span><span class="cx"> push(@depsContent, "$className.h : ", join(" ", map { "$_.idl" } @ancestors), "\n");
</span><span class="cx"> push(@depsContent, map { "$_.idl :\n" } @ancestors);
</span><span class="lines">@@ -4648,9 +4613,9 @@
</span><span class="cx"> foreach my $function (@{$interface->functions}) {
</span><span class="cx"> my @arguments = ();
</span><span class="cx"> foreach my $parameter (@{$function->parameters}) {
</span><del>- push(@arguments, GetNativeTypeForCallbacks($interface, $parameter->type) . " " . $parameter->name);
</del><ins>+ push(@arguments, GetNativeTypeForCallbacks($interface, $parameter->idlType) . " " . $parameter->name);
</ins><span class="cx"> }
</span><del>- push(@headerContent, " virtual " . GetNativeTypeForCallbacks($interface, $function->signature->type) . " " . $function->signature->name . "(" . join(", ", @arguments) . ");\n");
</del><ins>+ push(@headerContent, " virtual " . GetNativeTypeForCallbacks($interface, $function->signature->idlType) . " " . $function->signature->name . "(" . join(", ", @arguments) . ");\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4780,20 +4745,20 @@
</span><span class="cx"> push(@implContent, "\n// Functions\n");
</span><span class="cx"> foreach my $function (@{$interface->functions}) {
</span><span class="cx"> my @params = @{$function->parameters};
</span><del>- if ($function->signature->extendedAttributes->{Custom} || GetNativeType($interface, $function->signature->type) ne "bool") {
</del><ins>+ if ($function->signature->extendedAttributes->{Custom} || GetNativeType($interface, $function->signature->idlType) ne "bool") {
</ins><span class="cx"> next;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AddIncludesForTypeInImpl($function->signature->type);
</del><ins>+ AddToImplIncludesForIDLType($function->signature->idlType);
</ins><span class="cx"> my $functionName = $function->signature->name;
</span><del>- push(@implContent, "\n" . GetNativeTypeForCallbacks($interface, $function->signature->type) . " ${className}::${functionName}(");
</del><ins>+ push(@implContent, "\n" . GetNativeTypeForCallbacks($interface, $function->signature->idlType) . " ${className}::${functionName}(");
</ins><span class="cx">
</span><span class="cx"> my @args = ();
</span><span class="cx"> my @argsCheck = ();
</span><span class="cx"> foreach my $param (@params) {
</span><span class="cx"> my $paramName = $param->name;
</span><del>- AddIncludesForTypeInImpl($param->type, 1);
- push(@args, GetNativeTypeForCallbacks($interface, $param->type) . " " . $paramName);
</del><ins>+ AddToImplIncludesForIDLType($param->idlType, 1);
+ push(@args, GetNativeTypeForCallbacks($interface, $param->idlType) . " " . $paramName);
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, join(", ", @args));
</span><span class="cx"> push(@implContent, ")\n");
</span><span class="lines">@@ -4861,7 +4826,7 @@
</span><span class="cx"> my $nondeterministic = $function->signature->extendedAttributes->{Nondeterministic};
</span><span class="cx"> my $mayThrowLegacyException = $function->signature->extendedAttributes->{MayThrowLegacyException};
</span><span class="cx">
</span><del>- if ($function->signature->type eq "void" || IsReturningPromise($function)) {
</del><ins>+ if ($function->signature->idlType->name eq "void" || IsReturningPromise($function)) {
</ins><span class="cx"> if ($nondeterministic) {
</span><span class="cx"> AddToImplIncludes("<replay/InputCursor.h>", "WEB_REPLAY");
</span><span class="cx"> push(@implContent, "#if ENABLE(WEB_REPLAY)\n");
</span><span class="lines">@@ -4897,7 +4862,7 @@
</span><span class="cx"> AddToImplIncludes("<wtf/NeverDestroyed.h>", "WEB_REPLAY");
</span><span class="cx">
</span><span class="cx"> my $nativeType = GetNativeTypeFromSignature($interface, $function->signature);
</span><del>- my $memoizedType = GetNativeTypeForMemoization($interface, $function->signature->type);
</del><ins>+ my $memoizedType = GetNativeTypeForMemoization($interface, $function->signature->idlType);
</ins><span class="cx"> my $bindingName = $interface->name . "." . $function->signature->name;
</span><span class="cx"> push(@implContent, $indent . "JSValue result;\n");
</span><span class="cx"> push(@implContent, "#if ENABLE(WEB_REPLAY)\n");
</span><span class="lines">@@ -5052,7 +5017,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $signature) = @_;
</span><span class="cx">
</span><del>- return GetNativeType($interface, $signature->type);
</del><ins>+ return GetNativeType($interface, $signature->idlType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my %nativeType = (
</span><span class="lines">@@ -5081,7 +5046,7 @@
</span><span class="cx">
</span><span class="cx"> sub GetNativeVectorType
</span><span class="cx"> {
</span><del>- my ($interface, $type) = @_;
</del><ins>+ my ($type) = @_;
</ins><span class="cx">
</span><span class="cx"> die "This should only be called for sequence or array types" unless $codeGenerator->IsSequenceOrFrozenArrayType($type);
</span><span class="cx">
</span><span class="lines">@@ -5169,10 +5134,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> return $IDLTypes{$idlType->name} if exists $IDLTypes{$idlType->name};
</span><del>- return "IDLEnumeration<" . GetEnumerationClassName($idlType->name, $interface) . ">" if $codeGenerator->IsEnumType($idlType->name);
- return "IDLDictionary<" . GetDictionaryClassName($idlType->name, $interface) . ">" if $codeGenerator->IsDictionaryType($idlType->name);
- return "IDLSequence<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsSequenceType($idlType->name);
- return "IDLFrozenArray<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsFrozenArrayType($idlType->name);
</del><ins>+ return "IDLEnumeration<" . GetEnumerationClassName($idlType, $interface) . ">" if $codeGenerator->IsEnumType($idlType);
+ return "IDLDictionary<" . GetDictionaryClassName($idlType, $interface) . ">" if $codeGenerator->IsDictionaryType($idlType);
+ return "IDLSequence<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsSequenceType($idlType);
+ return "IDLFrozenArray<" . GetIDLType($interface, @{$idlType->subtypes}[0]) . ">" if $codeGenerator->IsFrozenArrayType($idlType);
</ins><span class="cx"> return "IDLUnion<" . join(", ", GetIDLUnionMemberTypes($interface, $idlType)) . ">" if $idlType->isUnion;
</span><span class="cx"> return "IDLInterface<" . $idlType->name . ">";
</span><span class="cx"> }
</span><span class="lines">@@ -5190,27 +5155,28 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $type) = @_;
</span><span class="cx">
</span><del>- return $nativeType{$type} if exists $nativeType{$type};
</del><ins>+ assert("Not a type") if ref($type) ne "domType";
</ins><span class="cx">
</span><ins>+ my $typeName = $type->name;
+
+ return $nativeType{$typeName} if exists $nativeType{$typeName};
+
</ins><span class="cx"> return GetEnumerationClassName($type, $interface) if $codeGenerator->IsEnumType($type);
</span><span class="cx"> return GetDictionaryClassName($type, $interface) if $codeGenerator->IsDictionaryType($type);
</span><ins>+ return GetNativeVectorType($type) if $codeGenerator->IsSequenceOrFrozenArrayType($type);
</ins><span class="cx">
</span><del>- my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
</del><ins>+ my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOffForType($type);
</ins><span class="cx"> return "${tearOffType}*" if $tearOffType;
</span><span class="cx">
</span><del>- return "RefPtr<${type}>" if $codeGenerator->IsTypedArrayType($type) and $type ne "ArrayBuffer";
-
- return GetNativeVectorType($interface, $type) if $codeGenerator->IsSequenceOrFrozenArrayType($type);
-
- return "${type}*";
</del><ins>+ return "RefPtr<${typeName}>" if $codeGenerator->IsTypedArrayType($type) and $typeName ne "ArrayBuffer";
+ return "${typeName}*";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub ShouldPassWrapperByReference
</span><span class="cx"> {
</span><del>- my $parameter = shift;
- my $interface = shift;
</del><ins>+ my ($parameter, $interface) = @_;
</ins><span class="cx">
</span><del>- my $nativeType = GetNativeType($interface, $parameter->type);
</del><ins>+ my $nativeType = GetNativeType($interface, $parameter->idlType);
</ins><span class="cx"> return $codeGenerator->ShouldPassWrapperByReference($parameter, $interface) && (substr($nativeType, -1) eq '*' || $nativeType =~ /^RefPtr/);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5218,8 +5184,10 @@
</span><span class="cx"> {
</span><span class="cx"> my $innerType = shift;
</span><span class="cx">
</span><del>- return $nativeType{$innerType} if exists $nativeType{$innerType};
- return "RefPtr<$innerType>";
</del><ins>+ my $innerTypeName = $innerType->name;
+
+ return $nativeType{$innerTypeName} if exists $nativeType{$innerTypeName};
+ return "RefPtr<$innerTypeName>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetNativeTypeForCallbacks
</span><span class="lines">@@ -5226,7 +5194,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $type) = @_;
</span><span class="cx">
</span><del>- return "RefPtr<SerializedScriptValue>&&" if $type eq "SerializedScriptValue";
</del><ins>+ return "RefPtr<SerializedScriptValue>&&" if $type->name eq "SerializedScriptValue";
</ins><span class="cx"> return "const String&" if $codeGenerator->IsStringType($type);
</span><span class="cx"> return GetNativeType($interface, $type);
</span><span class="cx"> }
</span><span class="lines">@@ -5240,18 +5208,20 @@
</span><span class="cx">
</span><span class="cx"> sub GetSVGPropertyTypes
</span><span class="cx"> {
</span><del>- my $implType = shift;
</del><ins>+ my $interface = shift;
</ins><span class="cx">
</span><ins>+ my $interfaceName = $interface->name;
+
</ins><span class="cx"> my $svgPropertyType;
</span><span class="cx"> my $svgListPropertyType;
</span><span class="cx"> my $svgNativeType;
</span><span class="cx">
</span><del>- return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $implType =~ /SVG/;
</del><ins>+ return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $interfaceName =~ /SVG/;
</ins><span class="cx">
</span><del>- $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implType);
</del><ins>+ $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOffForType($interface->type);
</ins><span class="cx"> return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
</span><span class="cx">
</span><del>- my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implType);
</del><ins>+ my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOffForType($interface->type);
</ins><span class="cx"> if ($svgNativeType =~ /SVGPropertyTearOff/) {
</span><span class="cx"> $svgPropertyType = $svgWrappedNativeType;
</span><span class="cx"> $headerIncludes{"$svgWrappedNativeType.h"} = 1;
</span><span class="lines">@@ -5278,7 +5248,8 @@
</span><span class="cx"> sub IsNativeType
</span><span class="cx"> {
</span><span class="cx"> my $type = shift;
</span><del>- return exists $nativeType{$type};
</del><ins>+
+ return exists $nativeType{$type->name};
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GetIntegerConversionConfiguration
</span><span class="lines">@@ -5309,11 +5280,11 @@
</span><span class="cx"> return 1 if $idlType->name eq "boolean";
</span><span class="cx"> return 1 if $idlType->name eq "Date";
</span><span class="cx"> return 1 if $idlType->name eq "BufferSource";
</span><del>- return 1 if $codeGenerator->IsIntegerType($idlType->name);
- return 1 if $codeGenerator->IsFloatingPointType($idlType->name);
- return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
- return 1 if $codeGenerator->IsDictionaryType($idlType->name);
- return 1 if $codeGenerator->IsStringType($idlType->name);
</del><ins>+ return 1 if $codeGenerator->IsIntegerType($idlType);
+ return 1 if $codeGenerator->IsFloatingPointType($idlType);
+ return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
+ return 1 if $codeGenerator->IsDictionaryType($idlType);
+ return 1 if $codeGenerator->IsStringType($idlType);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5323,7 +5294,6 @@
</span><span class="cx"> {
</span><span class="cx"> my ($interface, $signature, $value, $conditional, $statePointer, $stateReference, $thisObjectReference) = @_;
</span><span class="cx">
</span><del>- my $type = $signature->type;
</del><span class="cx"> my $idlType = $signature->idlType;
</span><span class="cx">
</span><span class="cx"> # FIXME: Remove these 3 variables when all JSValueToNative use references.
</span><span class="lines">@@ -5340,43 +5310,39 @@
</span><span class="cx"> my @conversionArguments = ();
</span><span class="cx"> push(@conversionArguments, "$stateReference");
</span><span class="cx"> push(@conversionArguments, "$value");
</span><del>- push(@conversionArguments, GetIntegerConversionConfiguration($signature)) if $codeGenerator->IsIntegerType($type);
- push(@conversionArguments, GetStringConversionConfiguration($signature)) if $codeGenerator->IsStringType($type);
</del><ins>+ push(@conversionArguments, GetIntegerConversionConfiguration($signature)) if $codeGenerator->IsIntegerType($idlType);
+ push(@conversionArguments, GetStringConversionConfiguration($signature)) if $codeGenerator->IsStringType($idlType);
</ins><span class="cx">
</span><span class="cx"> return ("convert<$IDLType>(" . join(", ", @conversionArguments) . ")", 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "DOMString") {
</del><ins>+ if ($idlType->name eq "DOMString") {
</ins><span class="cx"> return ("AtomicString($value.toString($statePointer)->toExistingAtomicString($statePointer))", 1) if $signature->extendedAttributes->{RequiresExistingAtomicString};
</span><span class="cx"> return ("$value.toString($statePointer)->toAtomicString($statePointer)", 1) if $signature->extendedAttributes->{AtomicString};
</span><span class="cx"> assert("Unhandled string conversion.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "SerializedScriptValue") {
</del><ins>+ if ($idlType->name eq "SerializedScriptValue") {
</ins><span class="cx"> AddToImplIncludes("SerializedScriptValue.h", $conditional);
</span><span class="cx"> return ("SerializedScriptValue::create($stateReference, $value)", 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "Dictionary") {
</del><ins>+ if ($idlType->name eq "Dictionary") {
</ins><span class="cx"> AddToImplIncludes("Dictionary.h", $conditional);
</span><span class="cx"> return ("Dictionary($statePointer, $value)", 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return ("to$type($value)", 1) if $codeGenerator->IsTypedArrayType($type);
-
- if ($codeGenerator->IsEnumType($type)) {
- AddToImplIncludes("JS$type.h", $conditional) if $codeGenerator->IsExternalEnumType($type);
- return ("parseEnumeration<" . GetEnumerationClassName($type, $interface) . ">($stateReference, $value)", 1);
- }
-
- AddToImplIncludes("JS$type.h", $conditional);
</del><ins>+ AddToImplIncludesForIDLType($idlType, $conditional);
</ins><span class="cx">
</span><ins>+ return ("to@{[$idlType->name]}($value)", 1) if $codeGenerator->IsTypedArrayType($idlType);
+ return ("parseEnumeration<" . GetEnumerationClassName($idlType, $interface) . ">($stateReference, $value)", 1) if $codeGenerator->IsEnumType($idlType);
+
</ins><span class="cx"> # FIXME: EventListener should be a callback interface.
</span><del>- return "JSEventListener::create($value, $thisObjectReference, false, currentWorld($statePointer))" if $type eq "EventListener";
</del><ins>+ return "JSEventListener::create($value, $thisObjectReference, false, currentWorld($statePointer))" if $idlType->name eq "EventListener";
</ins><span class="cx">
</span><del>- my $extendedAttributes = $codeGenerator->getInterfaceExtendedAttributesFromName($type);
- return ("JS${type}::toWrapped($stateReference, $value)", 1) if $type eq "XPathNSResolver";
- return ("JS${type}::toWrapped($value)", 0);
</del><ins>+ my $extendedAttributes = $codeGenerator->GetInterfaceExtendedAttributesFromName($idlType->name);
+ return ("JS" . $idlType->name . "::toWrapped($stateReference, $value)", 1) if $idlType->name eq "XPathNSResolver";
+ return ("JS" . $idlType->name . "::toWrapped($value)", 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub NativeToJSValueIsHandledByDOMConvert
</span><span class="lines">@@ -5386,12 +5352,12 @@
</span><span class="cx"> return 1 if $idlType->name eq "any";
</span><span class="cx"> return 1 if $idlType->name eq "boolean";
</span><span class="cx"> return 1 if $idlType->name eq "Date";
</span><del>- return 1 if $codeGenerator->IsIntegerType($idlType->name);
- return 1 if $codeGenerator->IsFloatingPointType($idlType->name);
- return 1 if $codeGenerator->IsStringType($idlType->name);
- return 1 if $codeGenerator->IsEnumType($idlType->name);
</del><ins>+ return 1 if $codeGenerator->IsIntegerType($idlType);
+ return 1 if $codeGenerator->IsFloatingPointType($idlType);
+ return 1 if $codeGenerator->IsStringType($idlType);
+ return 1 if $codeGenerator->IsEnumType($idlType);
+ return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
</ins><span class="cx"> return 1 if $idlType->isUnion;
</span><del>- return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
</del><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -5402,9 +5368,9 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: This should actually check if all the sub-objects of the union need the state.
</span><span class="cx"> return 1 if $idlType->isUnion;
</span><del>- return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
- return 1 if $codeGenerator->IsStringType($idlType->name);
- return 1 if $codeGenerator->IsEnumType($idlType->name);
</del><ins>+ return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
+ return 1 if $codeGenerator->IsStringType($idlType);
+ return 1 if $codeGenerator->IsEnumType($idlType);
</ins><span class="cx"> return 1 if $idlType->name eq "Date";
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -5416,7 +5382,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: This should actually check if all the sub-objects of the union need the global object.
</span><span class="cx"> return 1 if $idlType->isUnion;
</span><del>- return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
</del><ins>+ return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -5449,7 +5415,6 @@
</span><span class="cx"> my ($signature, $inFunctionCall, $interface, $value, $statePointer, $stateReference, $wrapped, $globalObject) = @_;
</span><span class="cx">
</span><span class="cx"> my $conditional = $signature->extendedAttributes->{Conditional};
</span><del>- my $type = $signature->type;
</del><span class="cx"> my $idlType = $signature->idlType;
</span><span class="cx"> my $isNullable = $signature->isNullable;
</span><span class="cx"> my $mayThrowException = $signature->extendedAttributes->{GetterMayThrowException} || $signature->extendedAttributes->{MayThrowException};
</span><span class="lines">@@ -5456,12 +5421,12 @@
</span><span class="cx">
</span><span class="cx"> # We could instead overload a function to work with optional as well as non-optional numbers, but this
</span><span class="cx"> # is slightly better because it guarantees we will fail to compile if the IDL file doesn't match the C++.
</span><del>- if ($signature->extendedAttributes->{Reflect} and ($type eq "unsigned long" or $type eq "unsigned short")) {
</del><ins>+ if ($signature->extendedAttributes->{Reflect} and ($idlType->name eq "unsigned long" or $idlType->name eq "unsigned short")) {
</ins><span class="cx"> $value =~ s/getUnsignedIntegralAttribute/getIntegralAttribute/g;
</span><span class="cx"> $value = "std::max(0, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "any") {
</del><ins>+ if ($idlType->name eq "any") {
</ins><span class="cx"> my $returnType = $signature->extendedAttributes->{ImplementationReturnType};
</span><span class="cx"> if (defined $returnType and ($returnType eq "IDBKeyPath" or $returnType eq "IDBKey")) {
</span><span class="cx"> AddToImplIncludes("IDBBindingUtilities.h", $conditional);
</span><span class="lines">@@ -5484,26 +5449,26 @@
</span><span class="cx"> return "toJS<$IDLType>(" . join(", ", @conversionArguments) . ")";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($type eq "SerializedScriptValue") {
</del><ins>+ if ($idlType->name eq "SerializedScriptValue") {
</ins><span class="cx"> AddToImplIncludes("SerializedScriptValue.h", $conditional);
</span><span class="cx"> return "$value ? $value->deserialize($stateReference, $globalObject) : jsNull()";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AddToImplIncludes("StyleProperties.h", $conditional) if $type eq "CSSStyleDeclaration";
- AddToImplIncludes("NameNodeList.h", $conditional) if $type eq "NodeList";
- AddToImplIncludes("JS$type.h", $conditional) if !$codeGenerator->IsTypedArrayType($type);
</del><ins>+ AddToImplIncludes("StyleProperties.h", $conditional) if $idlType->name eq "CSSStyleDeclaration";
+ AddToImplIncludes("NameNodeList.h", $conditional) if $idlType->name eq "NodeList";
+ AddToImplIncludes("JS" . $idlType->name . ".h", $conditional) if !$codeGenerator->IsTypedArrayType($idlType);
</ins><span class="cx">
</span><del>- return $value if $codeGenerator->IsSVGAnimatedType($type);
</del><ins>+ return $value if $codeGenerator->IsSVGAnimatedType($idlType);
</ins><span class="cx">
</span><del>- if ($codeGenerator->IsSVGAnimatedType($interface->name) or ($interface->name eq "SVGViewSpec" and $type eq "SVGTransformList")) {
</del><ins>+ if ($codeGenerator->IsSVGAnimatedType($interface->type) or ($interface->name eq "SVGViewSpec" and $idlType->name eq "SVGTransformList")) {
</ins><span class="cx"> # Convert from abstract RefPtr<ListProperty> to real type, so the right toJS() method can be invoked.
</span><del>- $value = "static_cast<" . GetNativeType($interface, $type) . ">($value.get())";
</del><ins>+ $value = "static_cast<" . GetNativeType($interface, $idlType) . ">($value.get())";
</ins><span class="cx"> } elsif ($interface->name eq "SVGViewSpec") {
</span><span class="cx"> # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
</span><del>- $value = "static_cast<" . GetNativeType($interface, $type) . ">($value)";
- } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($type) and not $interface->name =~ /List$/) {
- my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
- if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOff($type) and !$inFunctionCall and not defined $signature->extendedAttributes->{Immutable}) {
</del><ins>+ $value = "static_cast<" . GetNativeType($interface, $idlType) . ">($value)";
+ } elsif ($codeGenerator->IsSVGTypeNeedingTearOffForType($idlType) and not $interface->type->name =~ /List$/) {
+ my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOffForType($idlType);
+ if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOffForType($idlType) and !$inFunctionCall and not defined $signature->extendedAttributes->{Immutable}) {
</ins><span class="cx"> my $getter = $value;
</span><span class="cx"> $getter =~ s/impl\.//;
</span><span class="cx"> $getter =~ s/impl->//;
</span><span class="lines">@@ -5510,7 +5475,7 @@
</span><span class="cx"> $getter =~ s/\(\)//;
</span><span class="cx"> my $updateMethod = "&" . $interface->name . "::update" . $codeGenerator->WK_ucfirst($getter);
</span><span class="cx">
</span><del>- my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOff($interface->name);
</del><ins>+ my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOffForType($interface->type);
</ins><span class="cx"> if ($selfIsTearOffType) {
</span><span class="cx"> # FIXME: Why SVGMatrix specifically?
</span><span class="cx"> AddToImplIncludes("SVGMatrixTearOff.h", $conditional);
</span><span class="lines">@@ -5727,7 +5692,7 @@
</span><span class="cx">
</span><span class="cx"> my $checkType = $include;
</span><span class="cx"> $checkType =~ s/\.h//;
</span><del>- next if $codeGenerator->IsSVGAnimatedType($checkType);
</del><ins>+ next if $codeGenerator->IsSVGAnimatedTypeName($checkType);
</ins><span class="cx">
</span><span class="cx"> $include = "\"$include\"" unless $include =~ /^["<]/; # "
</span><span class="cx">
</span><span class="lines">@@ -6057,7 +6022,7 @@
</span><span class="cx"> # FIXME: IDL does not allow an interface without [NoInterfaceObject] to inherit one that is marked as [NoInterfaceObject]
</span><span class="cx"> # so we should be able to use our parent's interface object no matter what. However, some of our IDL files (e.g. CanvasRenderingContext2D)
</span><span class="cx"> # are not valid so we need this check for now.
</span><del>- if ($interface->parent && !$codeGenerator->getInterfaceExtendedAttributesFromName($interface->parent)->{NoInterfaceObject}) {
</del><ins>+ if ($interface->parent && !$codeGenerator->GetInterfaceExtendedAttributesFromName($interface->parent)->{NoInterfaceObject}) {
</ins><span class="cx"> my $parentClassName = "JS" . $interface->parent;
</span><span class="cx"> push(@$outputArray, " return ${parentClassName}::getConstructor(vm, &globalObject);\n");
</span><span class="cx"> } elsif ($interface->isCallback) {
</span><span class="lines">@@ -6137,7 +6102,7 @@
</span><span class="cx"> sub IsReturningPromise
</span><span class="cx"> {
</span><span class="cx"> my $function = shift;
</span><del>- return $function->signature->type && $function->signature->type eq "Promise";
</del><ins>+ return $function->signature->idlType && $function->signature->idlType->name eq "Promise";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub IsConstructable
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLParserpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -54,8 +54,9 @@
</span><span class="cx"> # Used to represent 'interface' blocks
</span><span class="cx"> struct( domInterface => {
</span><span class="cx"> name => '$', # Class identifier
</span><ins>+ type => '$', # Class type
</ins><span class="cx"> parent => '$', # Parent class identifier
</span><del>- parents => '@', # Parent class identifiers (Kept for compatibility with ObjC bindings)
</del><ins>+ parentType => '$', # Parent class type
</ins><span class="cx"> constants => '@', # List of 'domConstant'
</span><span class="cx"> functions => '@', # List of 'domFunction'
</span><span class="cx"> anonymousFunctions => '@', # List of 'domFunction'
</span><span class="lines">@@ -90,7 +91,6 @@
</span><span class="cx"> struct( domSignature => {
</span><span class="cx"> direction => '$', # Variable direction (in or out)
</span><span class="cx"> name => '$', # Variable name
</span><del>- type => '$', # Variable type name (DEPRECATED - please use idlType)
</del><span class="cx"> idlType => '$', # Variable type
</span><span class="cx"> specials => '@', # Specials
</span><span class="cx"> extendedAttributes => '$', # Extended attributes
</span><span class="lines">@@ -122,9 +122,9 @@
</span><span class="cx">
</span><span class="cx"> # Used to represent string constants
</span><span class="cx"> struct( domConstant => {
</span><del>- name => '$', # DOM Constant identifier
- type => '$', # Type of data
- value => '$', # Constant value
</del><ins>+ name => '$', # DOM Constant identifier
+ type => '$', # Type name of data
+ value => '$', # Constant value
</ins><span class="cx"> extendedAttributes => '$', # Extended attributes
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -131,13 +131,16 @@
</span><span class="cx"> # Used to represent 'enum' definitions
</span><span class="cx"> struct( domEnum => {
</span><span class="cx"> name => '$', # Enumeration identifier
</span><ins>+ type => '$', # Enumeration type
</ins><span class="cx"> values => '@', # Enumeration values (list of unique strings)
</span><span class="cx"> extendedAttributes => '$',
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> struct( domDictionary => {
</span><del>- parent => '$', # Parent class identifier
- name => '$',
</del><ins>+ name => '$', # Dictionary identifier
+ type => '$', # Dictionary type
+ parent => '$', # Parent identifier
+ parentType => '$', # Parent type identifier
</ins><span class="cx"> members => '@', # List of 'domSignature'
</span><span class="cx"> extendedAttributes => '$',
</span><span class="cx"> });
</span><span class="lines">@@ -363,6 +366,16 @@
</span><span class="cx"> return $type;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub makeSimpleType
+{
+ my $typeName = shift;
+
+ my $type = domType->new();
+ $type->name($typeName);
+
+ return $type;
+}
+
</ins><span class="cx"> my $nextAttribute_1 = '^(attribute|inherit|readonly)$';
</span><span class="cx"> my $nextPrimitiveType_1 = '^(int|long|short|unsigned)$';
</span><span class="cx"> my $nextPrimitiveType_2 = '^(double|float|unrestricted)$';
</span><span class="lines">@@ -477,8 +490,6 @@
</span><span class="cx"> # FIXME: This should be recursive.
</span><span class="cx"> my $numberOfSubtypes = scalar @{$signature->idlType->subtypes};
</span><span class="cx"> if ($numberOfSubtypes) {
</span><del>- my $typeUpdated = 0;
-
</del><span class="cx"> for my $i (0..$numberOfSubtypes - 1) {
</span><span class="cx"> my $subtype = @{$signature->idlType->subtypes}[$i];
</span><span class="cx"> my $subtypeName = $subtype->name;
</span><span class="lines">@@ -492,25 +503,8 @@
</span><span class="cx"> $clonedType->isNullable($subtype->isNullable);
</span><span class="cx">
</span><span class="cx"> @{$signature->idlType->subtypes}[$i] = $clonedType;
</span><del>-
- $typeUpdated = 1;
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- # FIXME: This can be removed when we use domTypes in the CodeGenerators everywhere.
- if ($typeUpdated) {
- my $subtype = @{$signature->idlType->subtypes}[0];
- my $subtypeName = $subtype->name;
-
- if ($signature->idlType->name =~ /^sequence</) {
- $signature->idlType->name("sequence<${subtypeName}>");
- $signature->type($signature->idlType->name);
- }
- if ($signature->idlType->name =~ /^FrozenArray</) {
- $signature->idlType->name("FrozenArray<${subtypeName}>");
- $signature->type($signature->idlType->name);
- }
- }
</del><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -524,7 +518,6 @@
</span><span class="cx"> $clonedType->isNullable($signature->idlType->isNullable);
</span><span class="cx">
</span><span class="cx"> $signature->idlType($clonedType);
</span><del>- $signature->type($clonedType->name);
</del><span class="cx"> $signature->isNullable($clonedType->isNullable);
</span><span class="cx">
</span><span class="cx"> copyExtendedAttributes($signature->extendedAttributes, $typedef->extendedAttributes);
</span><span class="lines">@@ -605,10 +598,18 @@
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "interface", __LINE__);
</span><span class="cx"> my $interfaceNameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($interfaceNameToken, IdentifierToken);
</span><del>- $interface->name(identifierRemoveNullablePrefix($interfaceNameToken->value()));
- my $parents = $self->parseInheritance();
- $interface->parents($parents);
- $interface->parent($parents->[0]);
</del><ins>+
+ my $name = identifierRemoveNullablePrefix($interfaceNameToken->value());
+ $interface->name($name);
+ $interface->type(makeSimpleType($name));
+
+ $next = $self->nextToken();
+ if ($next->value() eq ":") {
+ my $parent = $self->parseInheritance();
+ $interface->parent($parent);
+ $interface->parentType(makeSimpleType($parent));
+ }
+
</ins><span class="cx"> $self->assertTokenValue($self->getToken(), "{", __LINE__);
</span><span class="cx"> my $interfaceMembers = $self->parseInterfaceMembers();
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "}", __LINE__);
</span><span class="lines">@@ -715,11 +716,21 @@
</span><span class="cx"> my $dictionary = domDictionary->new();
</span><span class="cx"> $dictionary->extendedAttributes($extendedAttributeList);
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "dictionary", __LINE__);
</span><ins>+
</ins><span class="cx"> my $nameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($nameToken, IdentifierToken);
</span><del>- $dictionary->name($nameToken->value());
- my $parents = $self->parseInheritance();
- $dictionary->parent($parents->[0]);
</del><ins>+
+ my $name = $nameToken->value();
+ $dictionary->name($name);
+ $dictionary->type(makeSimpleType($name));
+
+ $next = $self->nextToken();
+ if ($next->value() eq ":") {
+ my $parent = $self->parseInheritance();
+ $dictionary->parent($parent);
+ $dictionary->parentType(makeSimpleType($parent));
+ }
+
</ins><span class="cx"> $self->assertTokenValue($self->getToken(), "{", __LINE__);
</span><span class="cx"> $dictionary->members($self->parseDictionaryMembers());
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "}", __LINE__);
</span><span class="lines">@@ -766,7 +777,6 @@
</span><span class="cx">
</span><span class="cx"> my $type = $self->parseType();
</span><span class="cx"> $member->idlType($type);
</span><del>- $member->type($type->name);
</del><span class="cx"> $member->isNullable($type->isNullable);
</span><span class="cx">
</span><span class="cx"> my $nameToken = $self->getToken();
</span><span class="lines">@@ -835,11 +845,19 @@
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "exception", __LINE__);
</span><span class="cx"> my $exceptionNameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($exceptionNameToken, IdentifierToken);
</span><del>- $interface->name(identifierRemoveNullablePrefix($exceptionNameToken->value()));
</del><ins>+
+ my $name = identifierRemoveNullablePrefix($exceptionNameToken->value());
+ $interface->name($name);
+ $interface->type(makeSimpleType($name));
</ins><span class="cx"> $interface->isException(1);
</span><del>- my $parents = $self->parseInheritance();
- $interface->parents($parents);
- $interface->parent($parents->[0]);
</del><ins>+
+ $next = $self->nextToken();
+ if ($next->value() eq ":") {
+ my $parent = $self->parseInheritance();
+ $interface->parent($parent);
+ $interface->parentType(makeSimpleType($parent));
+ }
+
</ins><span class="cx"> $self->assertTokenValue($self->getToken(), "{", __LINE__);
</span><span class="cx"> my $exceptionMembers = $self->parseExceptionMembers();
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "}", __LINE__);
</span><span class="lines">@@ -875,18 +893,13 @@
</span><span class="cx"> sub parseInheritance
</span><span class="cx"> {
</span><span class="cx"> my $self = shift;
</span><del>- my @parent = ();
</del><span class="cx">
</span><span class="cx"> my $next = $self->nextToken();
</span><span class="cx"> if ($next->value() eq ":") {
</span><span class="cx"> $self->assertTokenValue($self->getToken(), ":", __LINE__);
</span><del>- my $name = $self->parseName();
- push(@parent, $name);
-
- # FIXME: Remove. Was needed for needed for ObjC bindings.
- push(@parent, @{$self->parseIdentifiers()});
</del><ins>+ return $self->parseName();
</ins><span class="cx"> }
</span><del>- return \@parent;
</del><ins>+ $self->assertUnexpectedToken($next->value(), __LINE__);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub parseEnum
</span><span class="lines">@@ -900,7 +913,9 @@
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "enum", __LINE__);
</span><span class="cx"> my $enumNameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($enumNameToken, IdentifierToken);
</span><del>- $enum->name(identifierRemoveNullablePrefix($enumNameToken->value()));
</del><ins>+ my $name = identifierRemoveNullablePrefix($enumNameToken->value());
+ $enum->name($name);
+ $enum->type(makeSimpleType($name));
</ins><span class="cx"> $self->assertTokenValue($self->getToken(), "{", __LINE__);
</span><span class="cx"> push(@{$enum->values}, @{$self->parseEnumValueList()});
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "}", __LINE__);
</span><span class="lines">@@ -1015,10 +1030,8 @@
</span><span class="cx"> if ($next->value() eq "const") {
</span><span class="cx"> my $newDataNode = domConstant->new();
</span><span class="cx"> $self->assertTokenValue($self->getToken(), "const", __LINE__);
</span><del>-
</del><span class="cx"> my $type = $self->parseConstType();
</span><del>- $newDataNode->type($type->name);
-
</del><ins>+ $newDataNode->type($type);
</ins><span class="cx"> my $constNameToken = $self->getToken();
</span><span class="cx"> $self->assertTokenType($constNameToken, IdentifierToken);
</span><span class="cx"> $newDataNode->name(identifierRemoveNullablePrefix($constNameToken->value()));
</span><span class="lines">@@ -1286,7 +1299,6 @@
</span><span class="cx"> my $interface = $self->parseOperationRest($extendedAttributeList);
</span><span class="cx"> if (defined ($interface)) {
</span><span class="cx"> $interface->signature->idlType($returnType);
</span><del>- $interface->signature->type($returnType->name);
</del><span class="cx"> $interface->signature->isNullable($returnType->isNullable);
</span><span class="cx"> }
</span><span class="cx"> return $interface;
</span><span class="lines">@@ -1326,7 +1338,6 @@
</span><span class="cx">
</span><span class="cx"> my $type = $self->parseType();
</span><span class="cx"> $newDataNode->signature->idlType($type);
</span><del>- $newDataNode->signature->type($type->name);
</del><span class="cx"> $newDataNode->signature->isNullable($type->isNullable);
</span><span class="cx">
</span><span class="cx"> my $token = $self->getToken();
</span><span class="lines">@@ -1384,7 +1395,6 @@
</span><span class="cx"> if ($next->type() == IdentifierToken || $next->value() eq "(") {
</span><span class="cx"> my $operation = $self->parseOperationRest($extendedAttributeList);
</span><span class="cx"> $operation->signature->idlType($returnType);
</span><del>- $operation->signature->type($returnType->name);
</del><span class="cx"> $operation->signature->isNullable($returnType->isNullable);
</span><span class="cx">
</span><span class="cx"> return $operation;
</span><span class="lines">@@ -1406,7 +1416,6 @@
</span><span class="cx"> my $interface = $self->parseOperationRest($extendedAttributeList);
</span><span class="cx"> if (defined ($interface)) {
</span><span class="cx"> $interface->signature->idlType($returnType);
</span><del>- $interface->signature->type($returnType->name);
</del><span class="cx"> $interface->signature->isNullable($returnType->isNullable);
</span><span class="cx"> $interface->signature->specials(\@specials);
</span><span class="cx"> }
</span><span class="lines">@@ -1504,7 +1513,7 @@
</span><span class="cx"> $forEachFunction->signature->name("forEach");
</span><span class="cx"> my $forEachArgument = domSignature->new();
</span><span class="cx"> $forEachArgument->name("callback");
</span><del>- $forEachArgument->type("any");
</del><ins>+ $forEachArgument->idlType(makeSimpleType("any"));
</ins><span class="cx"> push(@{$forEachFunction->parameters}, ($forEachArgument));
</span><span class="cx">
</span><span class="cx"> my $newDataNode = domIterable->new();
</span><span class="lines">@@ -1627,7 +1636,6 @@
</span><span class="cx">
</span><span class="cx"> my $type = $self->parseType();
</span><span class="cx"> $paramDataNode->idlType($type);
</span><del>- $paramDataNode->type(identifierRemoveNullablePrefix($type->name));
</del><span class="cx"> $paramDataNode->isNullable($type->isNullable);
</span><span class="cx"> $paramDataNode->isOptional(1);
</span><span class="cx"> $paramDataNode->name($self->parseArgumentName());
</span><span class="lines">@@ -1637,7 +1645,6 @@
</span><span class="cx"> if ($next->type() == IdentifierToken || $next->value() =~ /$nextExceptionField_1/) {
</span><span class="cx"> my $type = $self->parseType();
</span><span class="cx"> $paramDataNode->idlType($type);
</span><del>- $paramDataNode->type($type->name);
</del><span class="cx"> $paramDataNode->isNullable($type->isNullable);
</span><span class="cx"> $paramDataNode->isOptional(0);
</span><span class="cx"> $paramDataNode->isVariadic($self->parseEllipsis());
</span><span class="lines">@@ -1700,7 +1707,6 @@
</span><span class="cx">
</span><span class="cx"> my $type = $self->parseType();
</span><span class="cx"> $newDataNode->signature->idlType($type);
</span><del>- $newDataNode->signature->type($type->name);
</del><span class="cx"> $newDataNode->signature->isNullable($type->isNullable);
</span><span class="cx">
</span><span class="cx"> my $token = $self->getToken();
</span><span class="lines">@@ -2116,8 +2122,7 @@
</span><span class="cx">
</span><span class="cx"> $self->assertTokenValue($self->getToken(), ">", __LINE__);
</span><span class="cx">
</span><del>- # FIXME: This should just be "sequence" when we start using domTypes in the CodeGenerators
- $type->name("sequence<${subtypeName}>");
</del><ins>+ $type->name("sequence");
</ins><span class="cx"> push(@{$type->subtypes}, $subtype);
</span><span class="cx">
</span><span class="cx"> return $type;
</span><span class="lines">@@ -2131,8 +2136,7 @@
</span><span class="cx">
</span><span class="cx"> $self->assertTokenValue($self->getToken(), ">", __LINE__);
</span><span class="cx">
</span><del>- # FIXME: This should just be "FrozenArray" when we start using domTypes in the CodeGenerators
- $type->name("FrozenArray<${subtypeName}>");
</del><ins>+ $type->name("FrozenArray");
</ins><span class="cx"> push(@{$type->subtypes}, $subtype);
</span><span class="cx">
</span><span class="cx"> return $type;
</span><span class="lines">@@ -2349,7 +2353,7 @@
</span><span class="cx"> # This check may have to move to the code generator, if we don't have enough information
</span><span class="cx"> # here to determine serializability: https://heycam.github.io/webidl/#idl-serializers
</span><span class="cx"> my $serializable_types = '^(\(byte|octet|short|unsigned short|long|unsigned long|long long|unsigned long long|float|unrestricted float|double|unrestricted double|boolean|DOMString|ByteString|USVString)$';
</span><del>- return $attribute->signature->type =~ /$serializable_types/;
</del><ins>+ return $attribute->signature->idlType->name =~ /$serializable_types/;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub applyMemberList
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSDOMConvert.h"
</span><span class="cx"> #include "JSNode.h"
</span><del>-#include "Node.h"
</del><span class="cx"> #include "wtf/text/AtomicString.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/PropertyNameArray.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSDOMConvert.h"
</span><del>-#include "TestObj.h"
</del><ins>+#include "JSTestObj.h"
</ins><span class="cx"> #include "TestSupplemental.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12) || ENABLE(Condition22) || ENABLE(Condition23)
</span><span class="cx"> #include "JSNode.h"
</span><del>-#include "JSTestObj.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -22,10 +22,8 @@
</span><span class="cx"> #include "JSTestObj.h"
</span><span class="cx">
</span><span class="cx"> #include "CallbackFunction.h"
</span><del>-#include "DOMStringList.h"
</del><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "Element.h"
</del><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -56,8 +54,6 @@
</span><span class="cx"> #include "JSTestSubObj.h"
</span><span class="cx"> #include "JSXPathNSResolver.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><del>-#include "SVGDocument.h"
-#include "SVGPoint.h"
</del><span class="cx"> #include "SVGStaticPropertyTearOff.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include "Settings.h"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "JSDOMConvert.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><ins>+#include <runtime/JSArray.h>
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "JSDOMConstructor.h"
</span><span class="cx"> #include "JSDOMConvert.h"
</span><span class="cx"> #include "JSNode.h"
</span><del>-#include "Node.h"
</del><span class="cx"> #include "wtf/text/AtomicString.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "JSMessagePort.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span><ins>+#include <runtime/JSArray.h>
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx"> #include "JSTestEventTarget.h"
</span><span class="cx"> #include "JSTestSubObj.h"
</span><del>-#include "SVGPoint.h"
</del><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/FunctionPrototype.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.idl (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> JSCustomGetOwnPropertySlotAndDescriptor,
</span><span class="cx"> CustomCall,
</span><span class="cx"> ] interface HTMLEmbedElement : HTMLElement {
</span><del>-[Reflect] attribute DOMString align;
-[Reflect] attribute DOMString height;
-[Reflect] attribute DOMString name;
-[Reflect, URL] attribute USVString src;
-[Reflect] attribute DOMString type;
-[Reflect] attribute DOMString width;
</del><ins>+ [Reflect] attribute DOMString align;
+ [Reflect] attribute DOMString height;
+ [Reflect] attribute DOMString name;
+ [Reflect, URL] attribute USVString src;
+ [Reflect] attribute DOMString type;
+ [Reflect] attribute DOMString width;
</ins><span class="cx">
</span><del>-[CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameElement.idl (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> // Extensions
</span><span class="cx"> readonly attribute DOMWindow contentWindow;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</ins><span class="cx">
</span><span class="cx"> // FIXME: No other browser has this attribute.
</span><span class="cx"> [CustomSetter] attribute DOMString location;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return m_contentFrame && HTMLElement::isKeyboardFocusable(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SVGDocument* HTMLFrameOwnerElement::getSVGDocument(ExceptionCode& ec) const
</del><ins>+Document* HTMLFrameOwnerElement::getSVGDocument(ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contentDocument();
</span><span class="cx"> if (is<SVGDocument>(document))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.h (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> // RenderElement when using fallback content.
</span><span class="cx"> RenderWidget* renderWidget() const;
</span><span class="cx">
</span><del>- SVGDocument* getSVGDocument(ExceptionCode&) const;
</del><ins>+ Document* getSVGDocument(ExceptionCode&) const;
</ins><span class="cx">
</span><span class="cx"> virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLIFrameElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLIFrameElement.idl (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -41,6 +41,6 @@
</span><span class="cx"> // Extensions
</span><span class="cx"> readonly attribute DOMWindow contentWindow;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.idl (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -50,6 +50,6 @@
</span><span class="cx"> // Introduced in DOM Level 2:
</span><span class="cx"> [CheckSecurityForNode] readonly attribute Document contentDocument;
</span><span class="cx">
</span><del>- [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
</del><ins>+ [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Tools/ChangeLog 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-27 Sam Weinig <sam@webkit.org>
+
+ [WebIDL] Move code generators off of domSignature::type and onto domSignature::idlType
+ https://bugs.webkit.org/show_bug.cgi?id=164089
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm:
+ * WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
+ Update for the removal of domSignature::type, and new signatures of helper predicates.
+
</ins><span class="cx"> 2016-10-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207992.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeBindingsCodeGeneratorDumpRenderTreepm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> sub _classRefGetter
</span><span class="cx"> {
</span><span class="cx"> my ($self, $idlType) = @_;
</span><ins>+
</ins><span class="cx"> return $$self{codeGenerator}->WK_lcfirst(_implementationClassName($idlType)) . "Class";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> my @contents = ();
</span><span class="cx">
</span><del>- my $idlType = $interface->name;
</del><ins>+ my $idlType = $interface->type;
</ins><span class="cx"> my $className = _className($idlType);
</span><span class="cx"> my $implementationClassName = _implementationClassName($idlType);
</span><span class="cx"> my $filename = $className . ".h";
</span><span class="lines">@@ -208,7 +209,7 @@
</span><span class="cx"> my %contentsIncludes = ();
</span><span class="cx"> my @contents = ();
</span><span class="cx">
</span><del>- my $idlType = $interface->name;
</del><ins>+ my $idlType = $interface->type;
</ins><span class="cx"> my $className = _className($idlType);
</span><span class="cx"> my $implementationClassName = _implementationClassName($idlType);
</span><span class="cx"> my $filename = $className . ".cpp";
</span><span class="lines">@@ -283,7 +284,7 @@
</span><span class="cx"> my @parameters = ();
</span><span class="cx"> my @specifiedParameters = @{$function->parameters};
</span><span class="cx">
</span><del>- $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
</del><ins>+ $self->_includeHeaders(\%contentsIncludes, $function->signature->idlType, $function->signature);
</ins><span class="cx">
</span><span class="cx"> if ($function->signature->extendedAttributes->{"PassContext"}) {
</span><span class="cx"> push(@parameters, "context");
</span><span class="lines">@@ -302,7 +303,7 @@
</span><span class="cx"> $functionCall = "impl->" . $function->signature->name . "(" . join(", ", @parameters) . ")";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@contents, " ${functionCall};\n\n") if $function->signature->type eq "void";
</del><ins>+ push(@contents, " ${functionCall};\n\n") if $function->signature->idlType->name eq "void";
</ins><span class="cx"> push(@contents, " return " . $self->_returnExpression($function->signature, $functionCall) . ";\n}\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -310,7 +311,7 @@
</span><span class="cx"> if (my @attributes = @{$interface->attributes}) {
</span><span class="cx"> push(@contents, "\n// Attributes\n");
</span><span class="cx"> foreach my $attribute (@attributes) {
</span><del>- $self->_includeHeaders(\%contentsIncludes, $attribute->signature->type, $attribute->signature);
</del><ins>+ $self->_includeHeaders(\%contentsIncludes, $attribute->signature->idlType, $attribute->signature);
</ins><span class="cx">
</span><span class="cx"> my $getterName = $self->_getterName($attribute);
</span><span class="cx"> my $getterExpression = "impl->${getterName}()";
</span><span class="lines">@@ -367,10 +368,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $attribute) = @_;
</span><span class="cx">
</span><del>- my $signature = $attribute->signature;
- my $name = $signature->name;
-
- return $name;
</del><ins>+ return $attribute->signature->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _includeHeaders
</span><span class="lines">@@ -378,8 +376,8 @@
</span><span class="cx"> my ($self, $headers, $idlType, $signature) = @_;
</span><span class="cx">
</span><span class="cx"> return unless defined $idlType;
</span><del>- return if $idlType eq "boolean";
- return if $idlType eq "object";
</del><ins>+ return if $idlType->name eq "boolean";
+ return if $idlType->name eq "object";
</ins><span class="cx"> return if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx">
</span><span class="lines">@@ -391,7 +389,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($idlType) = @_;
</span><span class="cx">
</span><del>- return $idlType;
</del><ins>+ return $idlType->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _parentClassName
</span><span class="lines">@@ -413,7 +411,7 @@
</span><span class="cx"> sub _parentInterface
</span><span class="cx"> {
</span><span class="cx"> my ($interface) = @_;
</span><del>- return $interface->parent;
</del><ins>+ return $interface->parentType;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _platformType
</span><span class="lines">@@ -422,8 +420,8 @@
</span><span class="cx">
</span><span class="cx"> return undef unless defined $idlType;
</span><span class="cx">
</span><del>- return "bool" if $idlType eq "boolean";
- return "JSValueRef" if $idlType eq "object";
</del><ins>+ return "bool" if $idlType->name eq "boolean";
+ return "JSValueRef" if $idlType->name eq "object";
</ins><span class="cx"> return "JSRetainPtr<JSStringRef>" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx"> return "double" if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return _implementationClassName($idlType);
</span><span class="lines">@@ -433,10 +431,10 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $argumentName) = @_;
</span><span class="cx">
</span><del>- my $idlType = $signature->type;
</del><ins>+ my $idlType = $signature->idlType;
</ins><span class="cx">
</span><span class="cx"> return "JSValueToBoolean(context, $argumentName)" if $idlType eq "boolean";
</span><del>- return "$argumentName" if $idlType eq "object";
</del><ins>+ return "$argumentName" if $idlType->name eq "object";
</ins><span class="cx"> return "JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, $argumentName, 0))" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx"> return "JSValueToNumber(context, $argumentName, 0)" if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return "to" . _implementationClassName($idlType) . "(context, $argumentName)";
</span><span class="lines">@@ -446,7 +444,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $variableName, $argumentName, $condition) = @_;
</span><span class="cx">
</span><del>- my $platformType = $self->_platformType($signature->type, $signature);
</del><ins>+ my $platformType = $self->_platformType($signature->idlType, $signature);
</ins><span class="cx"> my $constructor = $self->_platformTypeConstructor($signature, $argumentName);
</span><span class="cx">
</span><span class="cx"> my %nonPointerTypes = (
</span><span class="lines">@@ -474,11 +472,11 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $expression) = @_;
</span><span class="cx">
</span><del>- my $returnIDLType = $signature->type;
</del><ins>+ my $returnIDLType = $signature->idlType;
</ins><span class="cx">
</span><del>- return "JSValueMakeUndefined(context)" if $returnIDLType eq "void";
- return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType eq "boolean";
- return "${expression}" if $returnIDLType eq "object";
</del><ins>+ return "JSValueMakeUndefined(context)" if $returnIDLType->name eq "void";
+ return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType->name eq "boolean";
+ return "${expression}" if $returnIDLType->name eq "object";
</ins><span class="cx"> return "JSValueMakeNumber(context, ${expression})" if $$self{codeGenerator}->IsNonPointerType($returnIDLType);
</span><span class="cx"> return "JSValueMakeStringOrNull(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnIDLType);
</span><span class="cx"> return "toJS(context, WTF::getPtr(${expression}))";
</span><span class="lines">@@ -488,7 +486,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $parameter) = @_;
</span><span class="cx">
</span><del>- my $idlType = $parameter->type;
</del><ins>+ my $idlType = $parameter->idlType;
</ins><span class="cx"> my $name = $parameter->name;
</span><span class="cx">
</span><span class="cx"> return "${name}.get()" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="lines">@@ -523,7 +521,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $interface, $functionOrValue, $arrayTerminator, $mapFunction, $functionsOrAttributes) = @_;
</span><span class="cx">
</span><del>- my $className = _className($interface->name);
</del><ins>+ my $className = _className($interface->type);
</ins><span class="cx"> my $uppercaseFunctionOrValue = $$self{codeGenerator}->WK_ucfirst($functionOrValue);
</span><span class="cx">
</span><span class="cx"> my $result = <<EOF;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsCodeGeneratorTestRunnerpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm (208022 => 208023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm 2016-10-28 01:45:11 UTC (rev 208022)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm 2016-10-28 02:03:05 UTC (rev 208023)
</span><span class="lines">@@ -28,6 +28,19 @@
</span><span class="cx">
</span><span class="cx"> package CodeGeneratorTestRunner;
</span><span class="cx">
</span><ins>+use Carp qw<longmess>;
+use Data::Dumper;
+
+sub assert
+{
+ my $message = shift;
+
+ my $mess = longmess();
+ print Dumper($mess);
+
+ die $message;
+}
+
</ins><span class="cx"> sub new
</span><span class="cx"> {
</span><span class="cx"> my ($class, $codeGenerator, $writeDependencies, $verbose, $idlFilePath) = @_;
</span><span class="lines">@@ -58,6 +71,8 @@
</span><span class="cx"> {
</span><span class="cx"> my ($idlType) = @_;
</span><span class="cx">
</span><ins>+ assert("Not a type") if ref($idlType) ne "domType";
+
</ins><span class="cx"> return "JS" . _implementationClassName($idlType);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> my @contents = ();
</span><span class="cx">
</span><del>- my $idlType = $interface->name;
</del><ins>+ my $idlType = $interface->type;
</ins><span class="cx"> my $className = _className($idlType);
</span><span class="cx"> my $implementationClassName = _implementationClassName($idlType);
</span><span class="cx"> my $filename = $className . ".h";
</span><span class="lines">@@ -209,7 +224,7 @@
</span><span class="cx"> my %contentsIncludes = ();
</span><span class="cx"> my @contents = ();
</span><span class="cx">
</span><del>- my $idlType = $interface->name;
</del><ins>+ my $idlType = $interface->type;
</ins><span class="cx"> my $className = _className($idlType);
</span><span class="cx"> my $implementationClassName = _implementationClassName($idlType);
</span><span class="cx"> my $filename = $className . ".cpp";
</span><span class="lines">@@ -244,7 +259,7 @@
</span><span class="cx"> static JSClassRef jsClass;
</span><span class="cx"> if (!jsClass) {
</span><span class="cx"> JSClassDefinition definition = kJSClassDefinitionEmpty;
</span><del>- definition.className = "${idlType}";
</del><ins>+ definition.className = "@{[$idlType->name]}";
</ins><span class="cx"> definition.parentClass = @{[$self->_parentClassRefGetterExpression($interface)]};
</span><span class="cx"> definition.staticValues = staticValues();
</span><span class="cx"> definition.staticFunctions = staticFunctions();
</span><span class="lines">@@ -284,7 +299,7 @@
</span><span class="cx"> my @parameters = ();
</span><span class="cx"> my @specifiedParameters = @{$function->parameters};
</span><span class="cx">
</span><del>- $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
</del><ins>+ $self->_includeHeaders(\%contentsIncludes, $function->signature->idlType, $function->signature);
</ins><span class="cx">
</span><span class="cx"> if ($function->signature->extendedAttributes->{"PassContext"}) {
</span><span class="cx"> push(@parameters, "context");
</span><span class="lines">@@ -303,7 +318,7 @@
</span><span class="cx"> $functionCall = "impl->" . $function->signature->name . "(" . join(", ", @parameters) . ")";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@contents, " ${functionCall};\n\n") if $function->signature->type eq "void";
</del><ins>+ push(@contents, " ${functionCall};\n\n") if $function->signature->idlType->name eq "void";
</ins><span class="cx"> push(@contents, " return " . $self->_returnExpression($function->signature, $functionCall) . ";\n}\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -311,7 +326,7 @@
</span><span class="cx"> if (my @attributes = @{$interface->attributes}) {
</span><span class="cx"> push(@contents, "\n// Attributes\n");
</span><span class="cx"> foreach my $attribute (@attributes) {
</span><del>- $self->_includeHeaders(\%contentsIncludes, $attribute->signature->type, $attribute->signature);
</del><ins>+ $self->_includeHeaders(\%contentsIncludes, $attribute->signature->idlType, $attribute->signature);
</ins><span class="cx">
</span><span class="cx"> my $getterName = $self->_getterName($attribute);
</span><span class="cx"> my $getterExpression = "impl->${getterName}()";
</span><span class="lines">@@ -368,10 +383,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $attribute) = @_;
</span><span class="cx">
</span><del>- my $signature = $attribute->signature;
- my $name = $signature->name;
-
- return $name;
</del><ins>+ return $attribute->signature->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _includeHeaders
</span><span class="lines">@@ -379,8 +391,8 @@
</span><span class="cx"> my ($self, $headers, $idlType, $signature) = @_;
</span><span class="cx">
</span><span class="cx"> return unless defined $idlType;
</span><del>- return if $idlType eq "boolean";
- return if $idlType eq "object";
</del><ins>+ return if $idlType->name eq "boolean";
+ return if $idlType->name eq "object";
</ins><span class="cx"> return if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx">
</span><span class="lines">@@ -392,7 +404,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($idlType) = @_;
</span><span class="cx">
</span><del>- return $idlType;
</del><ins>+ return $idlType->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _parentClassName
</span><span class="lines">@@ -414,7 +426,7 @@
</span><span class="cx"> sub _parentInterface
</span><span class="cx"> {
</span><span class="cx"> my ($interface) = @_;
</span><del>- return $interface->parent;
</del><ins>+ return $interface->parentType;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub _platformType
</span><span class="lines">@@ -423,8 +435,8 @@
</span><span class="cx">
</span><span class="cx"> return undef unless defined $idlType;
</span><span class="cx">
</span><del>- return "bool" if $idlType eq "boolean";
- return "JSValueRef" if $idlType eq "object";
</del><ins>+ return "bool" if $idlType->name eq "boolean";
+ return "JSValueRef" if $idlType->name eq "object";
</ins><span class="cx"> return "JSRetainPtr<JSStringRef>" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx"> return "double" if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return _implementationClassName($idlType);
</span><span class="lines">@@ -434,10 +446,10 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $argumentName) = @_;
</span><span class="cx">
</span><del>- my $idlType = $signature->type;
</del><ins>+ my $idlType = $signature->idlType;
</ins><span class="cx">
</span><del>- return "JSValueToBoolean(context, $argumentName)" if $idlType eq "boolean";
- return "$argumentName" if $idlType eq "object";
</del><ins>+ return "JSValueToBoolean(context, $argumentName)" if $idlType->name eq "boolean";
+ return "$argumentName" if $idlType->name eq "object";
</ins><span class="cx"> return "JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, $argumentName, 0))" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="cx"> return "JSValueToNumber(context, $argumentName, 0)" if $$self{codeGenerator}->IsNonPointerType($idlType);
</span><span class="cx"> return "to" . _implementationClassName($idlType) . "(context, $argumentName)";
</span><span class="lines">@@ -447,7 +459,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $variableName, $argumentName, $condition) = @_;
</span><span class="cx">
</span><del>- my $platformType = $self->_platformType($signature->type, $signature);
</del><ins>+ my $platformType = $self->_platformType($signature->idlType, $signature);
</ins><span class="cx"> my $constructor = $self->_platformTypeConstructor($signature, $argumentName);
</span><span class="cx">
</span><span class="cx"> my %nonPointerTypes = (
</span><span class="lines">@@ -475,11 +487,11 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $signature, $expression) = @_;
</span><span class="cx">
</span><del>- my $returnIDLType = $signature->type;
</del><ins>+ my $returnIDLType = $signature->idlType;
</ins><span class="cx">
</span><del>- return "JSValueMakeUndefined(context)" if $returnIDLType eq "void";
- return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType eq "boolean";
- return "${expression}" if $returnIDLType eq "object";
</del><ins>+ return "JSValueMakeUndefined(context)" if $returnIDLType->name eq "void";
+ return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType->name eq "boolean";
+ return "${expression}" if $returnIDLType->name eq "object";
</ins><span class="cx"> return "JSValueMakeNumber(context, ${expression})" if $$self{codeGenerator}->IsNonPointerType($returnIDLType);
</span><span class="cx"> return "JSValueMakeStringOrNull(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnIDLType);
</span><span class="cx"> return "toJS(context, WTF::getPtr(${expression}))";
</span><span class="lines">@@ -489,7 +501,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $parameter) = @_;
</span><span class="cx">
</span><del>- my $idlType = $parameter->type;
</del><ins>+ my $idlType = $parameter->idlType;
</ins><span class="cx"> my $name = $parameter->name;
</span><span class="cx">
</span><span class="cx"> return "${name}.get()" if $$self{codeGenerator}->IsStringType($idlType);
</span><span class="lines">@@ -524,7 +536,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($self, $interface, $functionOrValue, $arrayTerminator, $mapFunction, $functionsOrAttributes) = @_;
</span><span class="cx">
</span><del>- my $className = _className($interface->name);
</del><ins>+ my $className = _className($interface->type);
</ins><span class="cx"> my $uppercaseFunctionOrValue = $$self{codeGenerator}->WK_ucfirst($functionOrValue);
</span><span class="cx">
</span><span class="cx"> my $result = <<EOF;
</span></span></pre>
</div>
</div>
</body>
</html>