Changeset 208023 in webkit

Timestamp:

Oct 27, 2016 7:03:05 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[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.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGenerator.pm (modified) (42 diffs)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (108 diffs)
• Source/WebCore/bindings/scripts/IDLParser.pm (modified) (27 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (modified) (2 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (2 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLEmbedElement.idl (modified) (1 diff)
• Source/WebCore/html/HTMLFrameElement.idl (modified) (1 diff)
• Source/WebCore/html/HTMLFrameOwnerElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLFrameOwnerElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLIFrameElement.idl (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.idl (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm (modified) (16 diffs)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm (modified) (18 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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).
+
 2016-10-27  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm

@@ -274 +274 @@
         my $currentInterface = shift;
 
-        for (@{$currentInterface->parents}) {
-            my $interfaceName = $_;
+        if  ($currentInterface->parentType) {
+            my $interfaceName = $currentInterface->parentType->name;
             my $parentInterface = $object->ParseInterface($outerInterface, $interfaceName);
 
@@ -327 +327 @@
 }
 
-sub GetAttributeFromInterface()
-{
-    my $object = shift;
-    my $outerInterface = shift;
-    my $interfaceName = shift;
-    my $attributeName = shift;
+sub GetAttributeFromInterface
+{
+    my ($object, $outerInterface, $interfaceName, $attributeName) = @_;
 
     my $interface = $object->ParseInterface($outerInterface, $interfaceName);
@@ -378 +375 @@
 sub SkipIncludeHeader
 {
-    my $object = shift;
-    my $type = shift;
+    my ($object, $typeName) = @_;
 
     # FIXME: This is a lot like !IsRefPtrType. Maybe they could share code?
 
-    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";
+    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";
 
     return 0;
@@ -399 +396 @@
     my ($object, $type) = @_;
 
-    return 1 if $integerTypeHash{$type};
-    return 1 if $floatingPointTypeHash{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $integerTypeHash{$type->name};
+    return 1 if $floatingPointTypeHash{$type->name};
     return 0;
 }
@@ -408 +407 @@
     my ($object, $type) = @_;
     
-    return 1 if $type eq "DOMString" or $type eq "USVString";
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $object->IsStringType($type);
     return 1 if $object->IsEnumType($type);
     return 0;
@@ -417 +418 @@
     my ($object, $type) = @_;
 
-    return 1 if $integerTypeHash{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $integerTypeHash{$type->name};
     return 0;
 }
@@ -425 +428 @@
     my ($object, $type) = @_;
 
-    return 1 if $floatingPointTypeHash{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $floatingPointTypeHash{$type->name};
     return 0;
 }
@@ -433 +438 @@
     my ($object, $type) = @_;
 
-    return 1 if $primitiveTypeHash{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $primitiveTypeHash{$type->name};
     return 1 if $object->IsNumericType($type);
     return 0;
@@ -443 +450 @@
     my ($object, $type) = @_;
 
-    return 1 if $type eq "DOMString";
-    return 1 if $type eq "USVString";
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $type->name eq "DOMString";
+    return 1 if $type->name eq "USVString";
     return 0;
 }
@@ -452 +461 @@
     my ($object, $type) = @_;
 
-    return defined($object->GetEnumByName($type));
-}
-
-sub GetEnumByName
-{
-    my ($object, $name) = @_;
-    
+    assert("Not a type") if ref($type) ne "domType";
+
+    return defined($object->GetEnumByType($type));
+}
+
+sub GetEnumByType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    my $name = $type->name;
+
     die "GetEnumByName() was called with an undefined enumeration name" unless defined($name);
 
@@ -495 +510 @@
     my ($object, $type) = @_;
 
-    return $object->IsEnumType($type) && defined($cachedExternalEnumerations->{$type});
-}
-
-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;
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $object->IsEnumType($type) && defined($cachedExternalEnumerations->{$type->name});
 }
 
@@ -512 +519 @@
     my ($object, $type) = @_;
 
-    return 1 if exists $enumTypeImplementationNameOverrides{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if exists $enumTypeImplementationNameOverrides{$type->name};
     return 0;
 }
@@ -520 +529 @@
     my ($object, $type) = @_;
 
-    return $enumTypeImplementationNameOverrides{$type};
-}
-
-sub GetDictionaryByName
-{
-    my ($object, $name) = @_;
-    die "GetDictionaryByName() was called with an undefined dictionary name" unless defined($name);
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $enumTypeImplementationNameOverrides{$type->name};
+}
+
+sub GetDictionaryByType
+{
+    my ($object, $type) = @_;
+
+    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);
 
     for my $dictionary (@{$useDocument->dictionaries}) {
@@ -561 +577 @@
     my ($object, $type) = @_;
 
-    return $type =~ /^[A-Z]/ && defined($object->GetDictionaryByName($type));
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $type->name =~ /^[A-Z]/ && defined($object->GetDictionaryByType($type));
 }
 
@@ -569 +587 @@
     my ($object, $type) = @_;
 
-    return $object->IsDictionaryType($type) && defined($cachedExternalDictionaries->{$type});
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $object->IsDictionaryType($type) && defined($cachedExternalDictionaries->{$type->name});
 }
 
@@ -576 +596 @@
     my ($object, $type) = @_;
 
-    return 1 if exists $dictionaryTypeImplementationNameOverrides{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if exists $dictionaryTypeImplementationNameOverrides{$type->name};
     return 0;
 }
@@ -584 +606 @@
     my ($object, $type) = @_;
 
-    return $dictionaryTypeImplementationNameOverrides{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $dictionaryTypeImplementationNameOverrides{$type->name};
 }
 
@@ -591 +615 @@
     my ($object, $type) = @_;
 
-    return 1 if $nonPointerTypeHash{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $nonPointerTypeHash{$type->name};
     return 1 if $object->IsPrimitiveType($type);
     return 0;
 }
 
-sub IsSVGTypeNeedingTearOff
-{
-    my $object = shift;
-    my $type = shift;
-
-    return 1 if exists $svgTypeNeedingTearOff{$type};
-    return 0;
-}
-
-sub IsSVGTypeWithWritablePropertiesNeedingTearOff
-{
-    my $object = shift;
-    my $type = shift;
-
-    return 1 if $svgTypeWithWritablePropertiesNeedingTearOff{$type};
+sub IsSVGTypeNeedingTearOffForType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if exists $svgTypeNeedingTearOff{$type->name};
+    return 0;
+}
+
+sub IsSVGTypeWithWritablePropertiesNeedingTearOffForType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $svgTypeWithWritablePropertiesNeedingTearOff{$type->name};
     return 0;
 }
@@ -616 +644 @@
 sub IsTypedArrayType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return 1 if $typedArrayTypes{$type};
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 1 if $typedArrayTypes{$type->name};
     return 0;
 }
@@ -625 +654 @@
 sub IsRefPtrType
 {
-    my $object = shift;
-    my $type = shift;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
 
     return 0 if $object->IsPrimitiveType($type);
@@ -632 +662 @@
     return 0 if $object->IsEnumType($type);
     return 0 if $object->IsSequenceOrFrozenArrayType($type);
-    return 0 if $type eq "DOMString" or $type eq "USVString";
-    return 0 if $type eq "any";
+    return 0 if $object->IsStringType($type);
+    return 0 if $type->name eq "any";
 
     return 1;
 }
 
-sub GetSVGTypeNeedingTearOff
-{
-    my $object = shift;
-    my $type = shift;
-
-    return $svgTypeNeedingTearOff{$type} if exists $svgTypeNeedingTearOff{$type};
+sub GetSVGTypeNeedingTearOffForType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $svgTypeNeedingTearOff{$type->name} if exists $svgTypeNeedingTearOff{$type->name};
     return undef;
 }
 
-sub GetSVGWrappedTypeNeedingTearOff
-{
-    my $object = shift;
-    my $type = shift;
-
-    my $svgTypeNeedingTearOff = $object->GetSVGTypeNeedingTearOff($type);
+sub GetSVGWrappedTypeNeedingTearOffForType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    my $svgTypeNeedingTearOff = $object->GetSVGTypeNeedingTearOffForType($type);
     return $svgTypeNeedingTearOff if not $svgTypeNeedingTearOff;
 
@@ -669 +701 @@
 }
 
+sub IsSVGAnimatedTypeName
+{
+    my ($object, $typeName) = @_;
+
+    return $typeName =~ /^SVGAnimated/;
+}
+
 sub IsSVGAnimatedType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $type =~ /^SVGAnimated/;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $object->IsSVGAnimatedTypeName($type->name);
+}
+
+sub IsConstructorType
+{
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $type->name =~ /Constructor$/;
 }
 
 sub IsSequenceType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $type =~ /^sequence</;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return $type->name eq "sequence";
 }
 
 sub GetSequenceInnerType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $1 if $type =~ /^sequence<([\w\d_\s]+)>.*/;
-    return "";
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return @{$type->subtypes}[0];
 }
 
 sub IsFrozenArrayType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $type =~ /^FrozenArray</;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    # FIXME: Update parser to make this just 'FrozenArray'
+    return $type->name eq "FrozenArray";
 }
 
 sub GetFrozenArrayInnerType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $1 if $type =~ /^FrozenArray<([\w\d_\s]+)>.*/;
-    return "";
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return @{$type->subtypes}[0];
 }
 
 sub IsSequenceOrFrozenArrayType
 {
-    my $object = shift;
-    my $type = shift;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
 
     return $object->IsSequenceType($type) || $object->IsFrozenArrayType($type);
@@ -721 +774 @@
 sub GetSequenceOrFrozenArrayInnerType
 {
-    my $object = shift;
-    my $type = shift;
-
-    return $object->GetSequenceInnerType($type) if $object->IsSequenceType($type);
-    return $object->GetFrozenArrayInnerType($type) if $object->IsFrozenArrayType($type);
-    return "";
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return @{$type->subtypes}[0];
 }
 
@@ -735 +787 @@
 {
     my ($object, $param) = @_;
+
     my $ret = ucfirst($param);
     $ret =~ s/Xml/XML/ if $ret =~ /^Xml[^a-z]/;
@@ -747 +800 @@
 {
     my ($object, $param) = @_;
+
     my $ret = lcfirst($param);
     $ret =~ s/dOM/dom/ if $ret =~ /^dOM/;
@@ -765 +819 @@
 }
 
-sub slurp {
+sub slurp
+{
     my $file = shift;
 
@@ -778 +833 @@
 {
     my $string = shift;
+
     $string =~ s/^\s+|\s+$//g;
     return $string;
@@ -786 +842 @@
 {
     my ($object, $interfaceName, $attributeName) = @_;
+
     return "SVGNames" if $interfaceName =~ /^SVG/ && !$svgAttributesInHTMLHash{$attributeName};
     return "HTMLNames";
@@ -821 +878 @@
         $attributeName = $attribute->signature->extendedAttributes->{"ImplementedAs"};
     }
-    my $attributeType = $attribute->signature->type;
+    my $attributeType = $attribute->signature->idlType;
 
     # SVG animated types need to use a special attribute name.
@@ -855 +912 @@
     }
 
-    my $attributeType = $attribute->signature->type;
+    my $attributeType = $attribute->signature->idlType;
 
     my $functionName;
     if ($attribute->signature->extendedAttributes->{"URL"}) {
         $functionName = "getURLAttribute";
-    } elsif ($attributeType eq "boolean") {
+    } elsif ($attributeType->name eq "boolean") {
         $functionName = "hasAttributeWithoutSynchronization";
-    } elsif ($attributeType eq "long") {
+    } elsif ($attributeType->name eq "long") {
         $functionName = "getIntegralAttribute";
-    } elsif ($attributeType eq "unsigned long") {
+    } elsif ($attributeType->name eq "unsigned long") {
         $functionName = "getUnsignedIntegralAttribute";
     } else {
@@ -893 +950 @@
     }
 
-    my $attributeType = $attribute->signature->type;
+    my $attributeType = $attribute->signature->idlType;
 
     my $functionName;
-    if ($attributeType eq "boolean") {
+    if ($attributeType->name eq "boolean") {
         $functionName = "setBooleanAttribute";
-    } elsif ($attributeType eq "long") {
+    } elsif ($attributeType->name eq "long") {
         $functionName = "setIntegralAttribute";
-    } elsif ($attributeType eq "unsigned long") {
+    } elsif ($attributeType->name eq "unsigned long") {
         $functionName = "setUnsignedIntegralAttribute";
     } elsif ($generator->IsSVGAnimatedType($attributeType)) {
@@ -913 +970 @@
 sub IsWrapperType
 {
-    my $object = shift;
-    my $type = shift;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
 
     return 0 if !$object->IsRefPtrType($type);
     return 0 if $object->IsTypedArrayType($type);
-    return 0 if $type eq "BufferSource";
-    return 0 if $type eq "UNION";
-    return 0 if $webCoreTypeHash{$type};
+    return 0 if $type->name eq "BufferSource";
+    return 0 if $type->name eq "UNION";
+    return 0 if $webCoreTypeHash{$type->name};
 
     return 1;
 }
 
-sub getInterfaceExtendedAttributesFromName
+sub GetInterfaceExtendedAttributesFromName
 {
     # FIXME: It's bad to have a function like this that opens another IDL file to answer a question.
     # Overusing this kind of function can make things really slow. Lets avoid these if we can.
 
-    my $object = shift;
-    my $interfaceName = shift;
+    my ($object, $interfaceName) = @_;
 
     my $idlFile = $object->IDLFileForInterface($interfaceName) or assert("Could NOT find IDL file for interface \"$interfaceName\"!\n");
@@ -960 +1017 @@
 sub ComputeIsCallbackInterface
 {
-  my $object = shift;
-  my $type = shift;
-
-  return 0 unless $object->IsWrapperType($type);
-
-  my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
-
-  open FILE, "<", $idlFile or die;
-  my @lines = <FILE>;
-  close FILE;
-
-  my $fileContents = join('', @lines);
-  return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 0 unless $object->IsWrapperType($type);
+
+    my $typeName = $type->name;
+    my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
+
+    open FILE, "<", $idlFile or die;
+    my @lines = <FILE>;
+    close FILE;
+
+    my $fileContents = join('', @lines);
+    return ($fileContents =~ /callback\s+interface\s+(\w+)/gs);
 }
 
@@ -985 +1044 @@
     my ($object, $type) = @_;
 
-    return $isCallbackInterface{$type} if exists $isCallbackInterface{$type};
-    my $result = ComputeIsCallbackInterface($object, $type);
-    $isCallbackInterface{$type} = $result;
+    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;
     return $result;
 }
@@ -996 +1057 @@
 sub ComputeIsFunctionOnlyCallbackInterface
 {
-  my $object = shift;
-  my $type = shift;
-
-  return 0 unless $object->IsCallbackInterface($type);
-
-  my $idlFile = $object->IDLFileForInterface($type) or assert("Could NOT find IDL file for interface \"$type\"!\n");
-
-  open FILE, "<", $idlFile or die;
-  my @lines = <FILE>;
-  close FILE;
-
-  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;
-
-          return 1 if ($key eq "Callback" && $value eq "FunctionOnly");
-      }
-  }
-
-  return 0;
+    my ($object, $type) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    return 0 unless $object->IsCallbackInterface($type);
+
+    my $typeName = $type->name;
+    my $idlFile = $object->IDLFileForInterface($typeName) or assert("Could NOT find IDL file for interface \"$typeName\"!\n");
+
+    open FILE, "<", $idlFile or die;
+    my @lines = <FILE>;
+    close FILE;
+
+    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;
+
+            return 1 if ($key eq "Callback" && $value eq "FunctionOnly");
+        }
+    }
+
+    return 0;
 }
 
@@ -1034 +1097 @@
     my ($object, $type) = @_;
 
-    return $isFunctionOnlyCallbackInterface{$type} if exists $isFunctionOnlyCallbackInterface{$type};
-    my $result = ComputeIsFunctionOnlyCallbackInterface($object, $type);
-    $isFunctionOnlyCallbackInterface{$type} = $result;
+    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;
     return $result;
 }
@@ -1042 +1107 @@
 sub GenerateConditionalString
 {
-    my $generator = shift;
-    my $node = shift;
+    my ($generator, $node) = @_;
 
     my $conditional = $node->extendedAttributes->{"Conditional"};
@@ -1055 +1119 @@
 sub GenerateConditionalStringFromAttributeValue
 {
-    my $generator = shift;
-    my $conditional = shift;
+    my ($generator, $conditional) = @_;
 
     my %disjunction;
@@ -1115 +1178 @@
 sub GetVisibleInterfaceName
 {
-    my $object = shift;
-    my $interface = shift;
+    my ($object, $interface) = @_;
+
     my $interfaceName = $interface->extendedAttributes->{"InterfaceName"};
     return $interfaceName ? $interfaceName : $interface->name;
@@ -1123 +1186 @@
 sub InheritsInterface
 {
-    my $object = shift;
-    my $interface = shift;
-    my $interfaceName = shift;
+    my ($object, $interface, $interfaceName) = @_;
+
+    return 1 if $interfaceName eq $interface->name;
+
     my $found = 0;
-
-    return 1 if $interfaceName eq $interface->name;
     $object->ForAllParents($interface, sub {
         my $currentInterface = shift;
@@ -1142 +1204 @@
 sub InheritsExtendedAttribute
 {
-    my $object = shift;
-    my $interface = shift;
-    my $extendedAttribute = shift;
+    my ($object, $interface, $extendedAttribute) = @_;
+
+    return 1 if $interface->extendedAttributes->{$extendedAttribute};
+
     my $found = 0;
-
-    return 1 if $interface->extendedAttributes->{$extendedAttribute};
     $object->ForAllParents($interface, sub {
         my $currentInterface = shift;
@@ -1161 +1222 @@
 sub ShouldPassWrapperByReference
 {
-    my $object = shift;
-    my $parameter = shift;
-    my $interface = shift;
+    my ($object, $parameter, $interface) = @_;
 
     return 0 if $parameter->isVariadic;
     return 0 if $parameter->isNullable;
-    return 0 if !$object->IsWrapperType($parameter->type) && !$object->IsTypedArrayType($parameter->type);
-    return 0 if $object->IsSVGTypeNeedingTearOff($parameter->type);
+    return 0 if !$object->IsWrapperType($parameter->idlType) && !$object->IsTypedArrayType($parameter->idlType);
+    return 0 if $object->IsSVGTypeNeedingTearOffForType($parameter->idlType);
 
     return 1;

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -137 +137 @@
     my ($object, $enumeration) = @_;
 
-    my $className = GetEnumerationClassName($enumeration->name);
+    my $className = GetEnumerationClassName($enumeration->type);
     $object->GenerateEnumerationHeader($enumeration, $className);
     $object->GenerateEnumerationImplementation($enumeration, $className);
@@ -146 +146 @@
     my ($object, $dictionary, $enumerations) = @_;
 
-    my $className = GetDictionaryClassName($dictionary->name);
+    my $className = GetDictionaryClassName($dictionary->type);
     $object->GenerateDictionaryHeader($dictionary, $className, $enumerations);
     $object->GenerateDictionaryImplementation($dictionary, $className, $enumerations);
@@ -180 +180 @@
         $stringifier->signature->extendedAttributes($extendedAttributeList);
         $stringifier->signature->name("toString");
-        die "stringifier can only be used on attributes of String types" unless $codeGenerator->IsStringType($attribute->signature->type);
+        die "stringifier can only be used on attributes of String types" unless $codeGenerator->IsStringType($attribute->signature->idlType);
         
         # FIXME: This should use IDLParser's cloneType.
         my $type = domType->new();
-        $type->name($attribute->signature->type);
+        $type->name($attribute->signature->idlType->name);
 
         $stringifier->signature->idlType($type);
-        $stringifier->signature->type($type->name);
 
         push(@{$interface->functions}, $stringifier);
@@ -211 +210 @@
     return $interface->extendedAttributes->{JSLegacyParent} if $interface->extendedAttributes->{JSLegacyParent};
     return "JSDOMObject" unless NeedsImplementationClass($interface);
-    return "JSDOMWrapper<" . GetImplClassName($interface->name) . ">" unless $interface->parent;
+    return "JSDOMWrapper<" . GetImplClassName($interface) . ">" unless $interface->parent;
     return "JS" . $interface->parent;
 }
@@ -227 +226 @@
 
     return $callbackInterface->extendedAttributes->{IsWeakCallback} ? "JSCallbackDataWeak" : "JSCallbackDataStrong";
-}
-
-sub AddIncludesForTypeInImpl
-{
-    my $type = shift;
-    my $isCallback = @_ ? shift : 0;
-    
-    AddIncludesForType($type, $isCallback, \%implIncludes);
-}
-
-sub AddIncludesForTypeInHeader
-{
-    my $type = shift;
-    my $isCallback = @_ ? shift : 0;
-    
-    AddIncludesForType($type, $isCallback, \%headerIncludes);
 }
 
@@ -253 +236 @@
 }
 
-sub AddIncludesForType
-{
-    my $type = shift;
-    my $isCallback = shift;
-    my $includesRef = shift;
-
-    return if $codeGenerator->SkipIncludeHeader($type);
+sub AddIncludesForImplementationTypeInImpl
+{
+    my $implementationType = shift;
     
-    # 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;
-    }
+    AddIncludesForImplementationType($implementationType, \%implIncludes);
+}
+
+sub AddIncludesForImplementationTypeInHeader
+{
+    my $implementationType = shift;
+    
+    AddIncludesForImplementationType($implementationType, \%headerIncludes);
+}
+
+sub AddIncludesForImplementationType
+{
+    my ($implementationType, $includesRef) = @_;
+
+    return if $codeGenerator->SkipIncludeHeader($implementationType);
+
+    $includesRef->{"${implementationType}.h"} = 1;
 }
 
@@ -293 +275 @@
     }
 
-    if ($codeGenerator->IsSequenceOrFrozenArrayType($idlType->name)) {
+    if ($codeGenerator->IsSequenceOrFrozenArrayType($idlType)) {
+        AddToImplIncludes("<runtime/JSArray.h>", $conditional);
         AddToImplIncludesForIDLType(@{$idlType->subtypes}[0], $conditional);
         return;
     }
 
-    if ($codeGenerator->IsExternalDictionaryType($idlType->name) || $codeGenerator->IsExternalEnumType($idlType->name)) {
-        AddToImplIncludes("JS" . $idlType->name . ".h", $conditional);
-        return;
-    }
-
-    if ($codeGenerator->IsWrapperType($idlType->name)) {
+    if ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsExternalDictionaryType($idlType) || $codeGenerator->IsExternalEnumType($idlType)) {
         AddToImplIncludes("JS" . $idlType->name . ".h", $conditional);
         return;
@@ -332 +310 @@
 sub AddClassForwardIfNeeded
 {
-    my $interfaceName = shift;
+    my $type = shift;
 
     # SVGAnimatedLength/Number/etc. are not classes so they can't be forward declared as classes.
-    return if $codeGenerator->IsSVGAnimatedType($interfaceName);
-
-    return if $codeGenerator->IsTypedArrayType($interfaceName);
-    return if $interfaceName eq "BufferSource";
-
-    push(@headerContent, "class $interfaceName;\n\n");
+    return if $codeGenerator->IsSVGAnimatedType($type);
+    return if $codeGenerator->IsTypedArrayType($type);
+    return if $type->name eq "BufferSource";
+
+    push(@headerContent, "class " . $type->name . ";\n\n");
 }
 
@@ -400 +377 @@
         # If the item function returns a string then we let the TreatReturnedNullStringAs handle the cases
         # where the index is out of range.
-        if ($indexedGetterFunction->signature->type eq "DOMString") {
+        
+        # FIXME: Should this work for all string types?
+        if ($indexedGetterFunction->signature->idlType->name eq "DOMString") {
             push(@getOwnPropertySlotImpl, "    if (optionalIndex) {\n");
         } else {
@@ -557 +536 @@
     return $codeGenerator->WK_lcfirst($className) . "Constructor" . $codeGenerator->WK_ucfirst($attribute->signature->name) if $attribute->isStatic;
     return GetJSBuiltinFunctionName($className, $attribute) if IsJSBuiltin($interface, $attribute);
-    return "js" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
+    return "js" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($codeGenerator->IsConstructorType($attribute->signature->idlType) ? "Constructor" : "");
 }
 
@@ -566 +545 @@
     return "set" . $codeGenerator->WK_ucfirst($className) . "Constructor" . $codeGenerator->WK_ucfirst($attribute->signature->name) if $attribute->isStatic;
     return "set" . $codeGenerator->WK_ucfirst(GetJSBuiltinFunctionName($className, $attribute)) if IsJSBuiltin($interface, $attribute);
-    return "setJS" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
+    return "setJS" . $interface->name . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($codeGenerator->IsConstructorType($attribute->signature->idlType) ? "Constructor" : "");
 }
 
@@ -593 +572 @@
         my $specialExists = grep { $_ eq $special } @$specials;
         my $parameters = $function->parameters;
-        if ($specialExists and scalar(@$parameters) == $numberOfParameters and $parameters->[0]->type eq $firstParameterType) {
+        if ($specialExists and scalar(@$parameters) == $numberOfParameters and $parameters->[0]->idlType->name eq $firstParameterType) {
             return $function;
         }
@@ -636 +615 @@
 
     return 1 if InterfaceRequiresAttributesOnInstance($interface);
-    return 1 if $attribute->signature->type =~ /Constructor$/;
+    return 1 if $codeGenerator->IsConstructorType($attribute->signature->idlType);
 
     # [Unforgeable] attributes should be on the instance.
@@ -678 +657 @@
 
     # As per Web IDL specification, constructor properties on the ECMAScript global object should not be enumerable.
-    my $is_global_constructor = $attribute->signature->type =~ /Constructor$/;
+    my $is_global_constructor = $attribute->signature->idlType->name =~ /Constructor$/;
     push(@specials, "DontEnum") if ($attribute->signature->extendedAttributes->{NotEnumerable} || $is_global_constructor);
     push(@specials, "ReadOnly") if IsReadonly($attribute);
@@ -799 +778 @@
 sub GetImplClassName
 {
-    my $name = shift;
-
-    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($name);
+    my $interface = shift;
+
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
     return $svgNativeType if $svgNativeType;
 
-    return $name;
+    return $interface->name;
 }
 
@@ -836 +815 @@
     my ($interface, $name) = @_;
 
-    my $class = GetImplClassName($interface->name);
+    my $class = GetImplClassName($interface);
     my $member = $codeGenerator->WK_ucfirst($name);
 
@@ -856 +835 @@
 sub GetEnumerationClassName
 {
-    my ($name, $interface) = @_;
-
-    if ($codeGenerator->HasEnumImplementationNameOverride($name)) {
-        return $codeGenerator->GetEnumImplementationNameOverride($name);
-    }
-
-    return $name if $codeGenerator->IsExternalEnumType($name);
+    my ($type, $interface) = @_;
+
+    assert("Not a type") if ref($type) ne "domType";
+
+    if ($codeGenerator->HasEnumImplementationNameOverride($type)) {
+        return $codeGenerator->GetEnumImplementationNameOverride($type);
+    }
+
+    my $name = $type->name;
+
+    return $name if $codeGenerator->IsExternalEnumType($type);
     return $name unless defined($interface);
 
@@ -1000 +983 @@
     my $result = "";
     foreach my $enumeration (@$enumerations) {
-        my $name = $enumeration->name;
-
-        my $className = GetEnumerationClassName($name, $interface);
+        my $className = GetEnumerationClassName($enumeration->type, $interface);
         my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
         $result .= GenerateEnumerationImplementationContent($enumeration, $className, $interface, $conditionalString);
@@ -1037 +1018 @@
     my $result = "";
     foreach my $enumeration (@$enumerations) {
-        my $className = GetEnumerationClassName($enumeration->name, $interface);
+        my $className = GetEnumerationClassName($enumeration->type, $interface);
         my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
         $result .= GenerateEnumerationHeaderContent($enumeration, $className, $conditionalString);
@@ -1046 +1027 @@
 sub GetDictionaryClassName
 {
-    my ($name, $interface) = @_;
-
-    if ($codeGenerator->HasDictionaryImplementationNameOverride($name)) {
-        return $codeGenerator->GetDictionaryImplementationNameOverride($name);
-    }
-
-    return $name if $codeGenerator->IsExternalDictionaryType($name);
+    my ($type, $interface) = @_;
+
+    if ($codeGenerator->HasDictionaryImplementationNameOverride($type)) {
+        return $codeGenerator->GetDictionaryImplementationNameOverride($type);
+    }
+
+    my $name = $type->name;
+    return $name if $codeGenerator->IsExternalDictionaryType($type);
     return $name unless defined($interface);
     return GetNestedClassName($interface, $name);
@@ -1063 +1045 @@
     my $defaultValue = $signature->default;
 
-    if ($codeGenerator->IsEnumType($signature->type)) {
+    if ($codeGenerator->IsEnumType($signature->idlType)) {
         # FIXME: Would be nice to report an error if the value does not have quote marks around it.
         # FIXME: Would be nice to report an error if the value is not one of the enumeration values.
-        my $className = GetEnumerationClassName($signature->type, $interface);
+        my $className = GetEnumerationClassName($signature->idlType, $interface);
         my $enumerationValueName = GetEnumerationValueName(substr($defaultValue, 1, -1));
         return $className . "::" . $enumerationValueName;
@@ -1077 +1059 @@
             return "convert<${IDLType}>(state, jsNull());";
         }
-        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);
+        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);
         return "Nullopt";
     }
@@ -1091 +1073 @@
 
     return $defaultValue;
-}
-
-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 "";
 }
 
@@ -1134 +1097 @@
     foreach my $dictionary (@$allDictionaries) {
         $headerIncludes{$interface->name . ".h"} = 1;
-        my $className = GetDictionaryClassName($dictionary->name, $interface);
+        my $className = GetDictionaryClassName($dictionary->type, $interface);
         my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
         $result .= GenerateDictionaryHeaderContent($dictionary, $className, $conditionalString);
@@ -1179 +1142 @@
     my @dictionaries;
     push(@dictionaries, $dictionary);
-    my $parentName = $dictionary->parent;
-    while (defined($parentName)) {
-        my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
-        assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless defined($parentDictionary);
+    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);
         unshift(@dictionaries, $parentDictionary);
-        $parentName = $parentDictionary->parent;
+        $parentType = $parentDictionary->parentType;
     }
 
@@ -1245 +1208 @@
     my $result = "";
     foreach my $dictionary (@$allDictionaries) {
-        my $className = GetDictionaryClassName($dictionary->name, $interface);
+        my $className = GetDictionaryClassName($dictionary->type, $interface);
         my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
         $result .= GenerateDictionaryImplementationContent($dictionary, $className, $interface, $conditionalString);
@@ -1318 +1281 @@
     $headerIncludes{"SVGElement.h"} = 1 if $className =~ /^JSSVG/;
 
-    my $implType = GetImplClassName($interfaceName);
-    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
+    my $implType = GetImplClassName($interface);
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
     my $svgPropertyOrListPropertyType;
     $svgPropertyOrListPropertyType = $svgPropertyType if $svgPropertyType;
@@ -1330 +1293 @@
     push(@headerContent, "\nnamespace WebCore {\n\n");
 
-    if ($codeGenerator->IsSVGAnimatedType($interfaceName)) {
+    if ($codeGenerator->IsSVGAnimatedType($interface->type)) {
         $headerIncludes{"$interfaceName.h"} = 1;
     } else {
         # Implementation class forward declaration
         if (IsDOMGlobalObject($interface)) {
-            AddClassForwardIfNeeded($interfaceName) unless $svgPropertyOrListPropertyType;
-        }
-    }
-
-    AddClassForwardIfNeeded("JSDOMWindowShell") if $interfaceName eq "DOMWindow";
+            AddClassForwardIfNeeded($interface->type) unless $svgPropertyOrListPropertyType;
+        }
+    }
+
+    push(@headerContent, "class JSDOMWindowShell;\n\n") if $interfaceName eq "DOMWindow";
 
     my $exportMacro = GetExportMacroForJSClass($interface);
@@ -1368 +1331 @@
         push(@headerContent, "    }\n\n");
     } elsif ($interface->extendedAttributes->{MasqueradesAsUndefined}) {
-        AddIncludesForTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
+        AddIncludesForImplementationTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
         push(@headerContent, "    static $className* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<$implType>&& impl)\n");
         push(@headerContent, "    {\n");
@@ -1384 +1347 @@
         push(@headerContent, "    }\n\n");  
     } else {
-        AddIncludesForTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
+        AddIncludesForImplementationTypeInHeader($implType) unless $svgPropertyOrListPropertyType;
         push(@headerContent, "    static $className* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<$implType>&& impl)\n");
         push(@headerContent, "    {\n");
@@ -1405 +1368 @@
     # JSValue to implementation type
     if (ShouldGenerateToWrapped($hasParent, $interface)) {
-        my $nativeType = GetNativeType($interface, $implType);
+        my $nativeType = GetNativeType($interface, $interface->type);
         if ($interface->name eq "XPathNSResolver") {
             push(@headerContent, "    static $nativeType toWrapped(JSC::ExecState&, JSC::JSValue);\n");
@@ -1819 +1782 @@
         }, 0);
         for my $dictionary (@$dictionaries) {
-            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;
+            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;
             }
         }
@@ -2033 +1996 @@
     my $isDictionary = sub {
         my $type = shift;
-        return $type eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
+        return $type->name eq "Dictionary" || $codeGenerator->IsDictionaryType($type);
     };
     my $isCallbackFunctionOrDictionary = sub {
@@ -2061 +2024 @@
     return 0 if $idlTypeA->name eq $idlTypeB->name;
     return 0 if $idlTypeA->name eq "object" or $idlTypeB->name eq "object";
-    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);
+    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);
     # FIXME: return 0 if $idlTypeA and $idlTypeB are both exception types.
     return 1;
@@ -2163 +2126 @@
     my $isDictionaryParameter = sub {
         my ($idlType, $optionality) = @_;
-        return $idlType->name eq "Dictionary" || $codeGenerator->IsDictionaryType($idlType->name);
+        return $idlType->name eq "Dictionary" || $codeGenerator->IsDictionaryType($idlType);
     };
     my $isNullableOrDictionaryParameterOrUnionContainingOne = sub {
@@ -2192 +2155 @@
     my $isObjectOrCallbackFunctionParameter = sub {
         my ($idlType, $optionality) = @_;
-        return $idlType->name eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($idlType->name);
+        return $idlType->name eq "object" || $codeGenerator->IsFunctionOnlyCallbackInterface($idlType);
     };
     my $isSequenceOrFrozenArrayParameter = sub {
         my ($idlType, $optionality) = @_;
-        return $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
+        return $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
     };
     my $isDictionaryOrObjectOrCallbackInterfaceParameter = sub {
@@ -2202 +2165 @@
         return 1 if &$isDictionaryParameter($idlType, $optionality);
         return 1 if $idlType->name eq "object";
-        return 1 if $codeGenerator->IsCallbackInterface($idlType->name) && !$codeGenerator->IsFunctionOnlyCallbackInterface($idlType->name);
+        return 1 if $codeGenerator->IsCallbackInterface($idlType) && !$codeGenerator->IsFunctionOnlyCallbackInterface($idlType);
         return 0;
     };
@@ -2211 +2174 @@
     my $isNumericParameter = sub {
         my ($idlType, $optionality) = @_;
-        return $codeGenerator->IsNumericType($idlType->name);
+        return $codeGenerator->IsNumericType($idlType);
     };
     my $isStringOrEnumParameter = sub {
         my ($idlType, $optionality) = @_;
-        return $codeGenerator->IsStringOrEnumType($idlType->name);
+        return $codeGenerator->IsStringOrEnumType($idlType);
     };
     my $isAnyParameter = sub {
@@ -2261 +2224 @@
                 my @idlSubtypes = $idlType->isUnion ? GetFlattenedMemberTypes($idlType) : ( $idlType );
                 for my $idlSubtype (@idlSubtypes) {
-                    my $type = $idlSubtype->name;
-                    if ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type)) {
-                        if ($type eq "DOMWindow") {
+                    if ($codeGenerator->IsWrapperType($idlSubtype) || $codeGenerator->IsTypedArrayType($idlSubtype)) {
+                        if ($idlSubtype->name eq "DOMWindow") {
                             AddToImplIncludes("JSDOMWindowShell.h");
                             &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && (asObject(distinguishingArg)->inherits(JSDOMWindowShell::info()) || asObject(distinguishingArg)->inherits(JSDOMWindow::info()))");
                         } else {
-                            &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS${type}::info())");
+                            &$generateOverloadCallIfNecessary($overload, "distinguishingArg.isObject() && asObject(distinguishingArg)->inherits(JS" . $idlSubtype->name . "::info())");
                         }
                     }
@@ -2368 +2330 @@
 {
     my $interface = shift;
+
     my $interfaceName = $interface->name;
-    $interfaceName = $codeGenerator->GetSVGTypeNeedingTearOff($interfaceName) if $codeGenerator->IsSVGTypeNeedingTearOff($interfaceName);
+    $interfaceName = $codeGenerator->GetSVGTypeNeedingTearOffForType($interface->type) if $codeGenerator->IsSVGTypeNeedingTearOffForType($interface->type);
     return $interfaceName;
 }
@@ -2532 +2495 @@
 {
     my $indexedGetterFunction = shift;
-    return "jsStringOrUndefined(state, thisObject->wrapped().item(index))" if $indexedGetterFunction->signature->type eq "DOMString";
+    
+    # FIXME: Should this work for all string types?
+    return "jsStringOrUndefined(state, thisObject->wrapped().item(index))" if $indexedGetterFunction->signature->idlType->name eq "DOMString";
     return "toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index))";
 }
@@ -2616 +2581 @@
     $implIncludes{"<runtime/PropertyNameArray.h>"} = 1 if $indexedGetterFunction;
 
-    my $implType = GetImplClassName($interfaceName);
+    my $implType = GetImplClassName($interface);
 
     AddJSBuiltinIncludesIfNeeded($interface);
@@ -2923 +2888 @@
     push(@implContent, ", CREATE_METHOD_TABLE($className) };\n\n");
 
-    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interface);
     my $svgPropertyOrListPropertyType;
     $svgPropertyOrListPropertyType = $svgPropertyType if $svgPropertyType;
@@ -2930 +2895 @@
     # Constructor
     if ($interfaceName eq "DOMWindow") {
-        AddIncludesForTypeInImpl("JSDOMWindowShell");
+        AddIncludesForImplementationTypeInImpl("JSDOMWindowShell");
         push(@implContent, "${className}::$className(VM& vm, Structure* structure, Ref<$implType>&& impl, JSDOMWindowShell* shell)\n");
         push(@implContent, "    : $parentClassName(vm, structure, WTFMove(impl), shell)\n");
@@ -2936 +2901 @@
         push(@implContent, "}\n\n");
     } elsif ($codeGenerator->InheritsInterface($interface, "WorkerGlobalScope")) {
-        AddIncludesForTypeInImpl($interfaceName);
+        AddIncludesForImplementationTypeInImpl($interfaceName);
         push(@implContent, "${className}::$className(VM& vm, Structure* structure, Ref<$implType>&& impl)\n");
         push(@implContent, "    : $parentClassName(vm, structure, WTFMove(impl))\n");
@@ -3080 +3045 @@
 
             if ($indexedGetterFunction) {
-                if ($indexedGetterFunction->signature->type eq "DOMString") {
+                # FIXME: Should this work for all string types?
+                if ($indexedGetterFunction->signature->idlType->name eq "DOMString") {
                     push(@implContent, "    if (LIKELY(index <= MAX_ARRAY_INDEX)) {\n");
                 } else {
@@ -3159 +3125 @@
 
             my $name = $attribute->signature->name;
-            my $type = $attribute->signature->type;
+            my $idlType = $attribute->signature->idlType;
             my $getFunctionName = GetAttributeGetterName($interface, $className, $attribute);
             my $implGetterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->extendedAttributes->{ImplementedAs} || $name);
@@ -3169 +3135 @@
             push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
 
-            if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
+            if (!$attribute->isStatic || $codeGenerator->IsConstructorType($idlType)) {
                 my $templateParameters = "${getFunctionName}Getter";
                 if ($attribute->signature->extendedAttributes->{LenientThis}) {
@@ -3208 +3174 @@
 
             # Global constructors can be disabled at runtime.
-            if ($attribute->signature->type =~ /Constructor$/) {
+            if ($codeGenerator->IsConstructorType($idlType)) {
                 if ($attribute->signature->extendedAttributes->{EnabledBySetting}) {
                     AddToImplIncludes("Frame.h");
@@ -3243 +3209 @@
                 push(@implContent, "    InputCursor& cursor = globalObject->inputCursor();\n");
 
-                my $nativeType = GetNativeType($interface, $type);
-                my $memoizedType = GetNativeTypeForMemoization($interface, $type);
+                my $nativeType = GetNativeType($interface, $idlType);
+                my $memoizedType = GetNativeTypeForMemoization($interface, $idlType);
                 my $exceptionCode = $getterMayThrowLegacyException ? "ec" : "0";
                 push(@implContent, "    static NeverDestroyed<const AtomicString> bindingName(\"$interfaceName.$name\", AtomicString::ConstructFromLiteral);\n");
@@ -3274 +3240 @@
                 push(@implContent, "    auto& impl = thisObject.wrapped();\n");
                 push(@implContent, "    return shouldAllowAccessToNode(&state, impl." . $attribute->signature->name . "()) ? " . NativeToJSValueUsingReferences($attribute->signature, 0, $interface, "impl.$implGetterFunctionName()", "thisObject") . " : jsNull();\n");
-            } elsif ($type eq "EventHandler") {
+            } elsif ($idlType->name eq "EventHandler") {
                 $implIncludes{"EventNames.h"} = 1;
                 my $getter = $attribute->signature->extendedAttributes->{WindowEventHandler} ? "windowEventHandlerAttribute"
@@ -3281 +3247 @@
                 my $eventName = EventHandlerAttributeEventName($attribute);
                 push(@implContent, "    return $getter(thisObject.wrapped(), $eventName);\n");
-            } elsif ($attribute->signature->type =~ /Constructor$/) {
-                my $constructorType = $attribute->signature->type;
+            } elsif ($codeGenerator->IsConstructorType($attribute->signature->idlType)) {
+                my $constructorType = $attribute->signature->idlType->name;
                 $constructorType =~ s/Constructor$//;
                 # When Constructor attribute is used by DOMWindow.idl, it's correct to pass thisObject as the global object
@@ -3331 +3297 @@
                     my $jsType = NativeToJSValueUsingReferences($attribute->signature, 0, $interface, "${functionName}(" . join(", ", @arguments) . ")", "thisObject");
                     push(@implContent, "    auto& impl = thisObject.wrapped();\n") if !$attribute->isStatic;
-                    if ($codeGenerator->IsSVGAnimatedType($type)) {
+                    if ($codeGenerator->IsSVGAnimatedType($idlType)) {
                         push(@implContent, "    auto obj = $jsType;\n");
                         push(@implContent, "    JSValue result = toJS(&state, thisObject.globalObject(), obj.get());\n");
@@ -3479 +3445 @@
 
             my $name = $attribute->signature->name;
-            my $type = $attribute->signature->type;
+            my $idlType = $attribute->signature->idlType;
             my $putFunctionName = GetAttributeSetterName($interface, $className, $attribute);
             my $implSetterFunctionName = $codeGenerator->WK_ucfirst($name);
@@ -3533 +3499 @@
                 push(@implContent, "    thisObject.set$implSetterFunctionName(state, value);\n");
                 push(@implContent, "    return true;\n");
-            } elsif ($type eq "EventHandler") {
+            } elsif ($idlType->name eq "EventHandler") {
                 $implIncludes{"JSEventListener.h"} = 1;
                 my $eventName = EventHandlerAttributeEventName($attribute);
@@ -3548 +3514 @@
                 }
                 push(@implContent, "    return true;\n");
-            } elsif ($type =~ /Constructor$/) {
-                my $constructorType = $type;
+            } elsif ($codeGenerator->IsConstructorType($idlType)) {
+                my $constructorType = $idlType->name;
                 $constructorType =~ s/Constructor$//;
                 # $constructorType ~= /Constructor$/ indicates that it is NamedConstructor.
@@ -3571 +3537 @@
                     if ($putForwards) {
                         my $implGetterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->extendedAttributes->{ImplementedAs} || $name);
-                        my $forwardedAttribute = $codeGenerator->GetAttributeFromInterface($interface, $type, $putForwards);
+                        my $forwardedAttribute = $codeGenerator->GetAttributeFromInterface($interface, $idlType->name, $putForwards);
 
                         if ($forwardedAttribute->signature->extendedAttributes->{CEReactions}) {
@@ -3580 +3546 @@
                         }
 
+                        my $typeName = $idlType->name;
                         if ($attribute->signature->isNullable) {
-                            push(@implContent, "    RefPtr<${type}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
+                            push(@implContent, "    RefPtr<${typeName}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
                             push(@implContent, "    if (!forwardedImpl)\n");
                             push(@implContent, "        return false;\n");
@@ -3587 +3554 @@
                         } else {
                             # Attribute is not nullable, the implementation is expected to return a reference.
-                            push(@implContent, "    Ref<${type}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
+                            push(@implContent, "    Ref<${typeName}> forwardedImpl = thisObject.wrapped().${implGetterFunctionName}();\n");
                             push(@implContent, "    auto& impl = forwardedImpl.get();\n");
                         }
                         $attribute = $forwardedAttribute;
-                        $type = $attribute->signature->type;
+                        $idlType = $attribute->signature->idlType;
                     } else {
                         push(@implContent, "    auto& impl = thisObject.wrapped();\n");
@@ -3602 +3569 @@
 
                 my ($nativeValue, $mayThrowException) = JSValueToNative($interface, $attribute->signature, "value", $attribute->signature->extendedAttributes->{Conditional}, "&state", "state", "thisObject");
-                if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
+                if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsTypedArrayType($idlType))) {
                     $implIncludes{"<runtime/Error.h>"} = 1;
                     push(@implContent, "    " . GetNativeTypeFromSignature($interface, $attribute->signature) . " nativeValue = nullptr;\n");
@@ -3609 +3576 @@
                     push(@implContent, "        RETURN_IF_EXCEPTION(throwScope, false);\n") if $mayThrowException;
                     push(@implContent, "        if (UNLIKELY(!nativeValue)) {\n");
-                    push(@implContent, "            throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"$type\");\n");
+                    push(@implContent, "            throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"" . $idlType->name . "\");\n");
                     push(@implContent, "            return false;\n");
                     push(@implContent, "        }\n");
@@ -3618 +3585 @@
                 }
 
-                if ($codeGenerator->IsEnumType($type)) {
+                if ($codeGenerator->IsEnumType($idlType)) {
                     push (@implContent, "    if (UNLIKELY(!nativeValue))\n");
                     push (@implContent, "        return false;\n");
@@ -3625 +3592 @@
                 if ($shouldPassByReference) {
                     push(@implContent, "    if (UNLIKELY(!nativeValue)) {\n");
-                    push(@implContent, "        throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"$type\");\n");
+                    push(@implContent, "        throwAttributeTypeError(state, throwScope, \"$visibleInterfaceName\", \"$name\", \"" . $idlType->name . "\");\n");
                     push(@implContent, "        return false;\n");
                     push(@implContent, "    }\n");
@@ -3661 +3628 @@
                     my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
 
-                    if ($codeGenerator->IsTypedArrayType($type) and not $type eq "ArrayBuffer") {
+                    if ($codeGenerator->IsTypedArrayType($idlType) and not $idlType->name eq "ArrayBuffer") {
                         push(@arguments, "nativeValue.get()");
-                    } elsif ($codeGenerator->IsEnumType($type)) {
+                    } elsif ($codeGenerator->IsEnumType($idlType)) {
                         push(@arguments, "nativeValue.value()");
                     } else {
@@ -3752 +3719 @@
             next if $isCustom && $isOverloaded && $function->{overloadIndex} > 1;
 
-            AddIncludesForTypeInImpl($function->signature->type) unless $isCustom or IsReturningPromise($function);
+            AddToImplIncludesForIDLType($function->signature->idlType) unless $isCustom or IsReturningPromise($function);
 
             my $functionName = GetFunctionName($interface, $className, $function);
@@ -3950 +3917 @@
 
     if ($indexedGetterFunction) {
-        $implIncludes{"URL.h"} = 1 if $indexedGetterFunction->signature->type eq "DOMString";
+        # FIXME: Should this work for all string types.
+        $implIncludes{"URL.h"} = 1 if $indexedGetterFunction->signature->idlType->name eq "DOMString";
         if ($interfaceName =~ /^HTML\w*Collection$/ or $interfaceName eq "RadioNodeList") {
             $implIncludes{"JSNode.h"} = 1;
@@ -4301 +4269 @@
 sub WillConvertUndefinedToDefaultParameterValue
 {
-    my $parameterType = shift;
-    my $defaultValue = shift;
-
-    my $automaticallyGeneratedDefaultValue = $automaticallyGeneratedDefaultValues{$parameterType};
+    my ($parameterType, $defaultValue) = @_;
+
+    my $automaticallyGeneratedDefaultValue = $automaticallyGeneratedDefaultValues{$parameterType->name};
     return 1 if defined $automaticallyGeneratedDefaultValue && $automaticallyGeneratedDefaultValue eq $defaultValue;
 
@@ -4350 +4317 @@
     my $argumentIndex = 0;
     foreach my $parameter (@{$function->parameters}) {
-        my $type = $parameter->type;
         my $idlType = $parameter->idlType;
 
-        die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($type);
+        die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($idlType);
         die "Optional parameters preceding variadic parameters are not supported" if ($parameter->isOptional &&  @{$function->parameters}[$numParameters - 1]->isVariadic);
 
         if ($parameter->isOptional && !defined($parameter->default)) {
             # As per Web IDL, optional dictionary parameters are always considered to have a default value of an empty dictionary, unless otherwise specified.
-            $parameter->default("[]") if $type eq "Dictionary" or $codeGenerator->IsDictionaryType($type);
+            $parameter->default("[]") if $idlType->name eq "Dictionary" or $codeGenerator->IsDictionaryType($idlType);
 
             # We use undefined as default value for optional parameters of type 'any' unless specified otherwise.
-            $parameter->default("undefined") if $type eq "any";
+            $parameter->default("undefined") if $idlType->name eq "any";
 
             # We use the null string as default value for parameters of type DOMString unless specified otherwise.
-            $parameter->default("null") if $codeGenerator->IsStringType($type);
+            $parameter->default("null") if $codeGenerator->IsStringType($idlType);
 
             # As per Web IDL, passing undefined for a nullable parameter is treated as null. Therefore, use null as
@@ -4371 +4337 @@
 
             # For callback parameters, the generated bindings treat undefined as null, so use null as implicit default value.
-            $parameter->default("null") if $codeGenerator->IsCallbackInterface($type);
+            $parameter->default("null") if $codeGenerator->IsCallbackInterface($idlType);
         }
 
@@ -4377 +4343 @@
         my $value = $name;
 
-        if ($codeGenerator->IsCallbackInterface($type)) {
-            my $callbackClassName = GetCallbackClassName($type);
+        if ($codeGenerator->IsCallbackInterface($idlType)) {
+            my $callbackClassName = GetCallbackClassName($idlType->name);
+            my $typeName = $idlType->name;
             $implIncludes{"$callbackClassName.h"} = 1;
             if ($parameter->isOptional) {
-                push(@$outputArray, "    RefPtr<$type> $name;\n");
+                push(@$outputArray, "    RefPtr<$typeName> $name;\n");
                 push(@$outputArray, "    if (!state->argument($argumentIndex).isUndefinedOrNull()) {\n");
-                if ($codeGenerator->IsFunctionOnlyCallbackInterface($type)) {
+                if ($codeGenerator->IsFunctionOnlyCallbackInterface($idlType)) {
                     push(@$outputArray, "        if (!state->uncheckedArgument($argumentIndex).isFunction())\n");
                 } else {
@@ -4398 +4365 @@
             } else {
                 die "CallbackInterface does not support Variadic parameter" if $parameter->isVariadic;
-                if ($codeGenerator->IsFunctionOnlyCallbackInterface($type)) {
+                if ($codeGenerator->IsFunctionOnlyCallbackInterface($idlType)) {
                     push(@$outputArray, "    if (UNLIKELY(!state->uncheckedArgument($argumentIndex).isFunction()))\n");
                 } else {
@@ -4422 +4389 @@
             $value = "WTFMove($name.arguments.value())";
 
-        } elsif ($codeGenerator->IsEnumType($type)) {
-            my $className = GetEnumerationClassName($type, $interface);
+        } elsif ($codeGenerator->IsEnumType($idlType)) {
+            my $className = GetEnumerationClassName($idlType, $interface);
 
             $implIncludes{"<runtime/Error.h>"} = 1;
@@ -4455 +4422 @@
             }
 
-            $implIncludes{"JS$className.h"} = 1 if $codeGenerator->IsExternalEnumType($type);
+            $implIncludes{"JS$className.h"} = 1 if $codeGenerator->IsExternalEnumType($idlType);
             push(@$outputArray, "$indent    $defineOptionalValue = parseEnumeration<$className>(*state, ${name}Value);\n");
             push(@$outputArray, "$indent    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
@@ -4467 +4434 @@
             my $inner;
             my $nativeType = GetNativeTypeFromSignature($interface, $parameter);
-            my $isTearOff = $codeGenerator->IsSVGTypeNeedingTearOff($type) && $interfaceName !~ /List$/;
+            my $isTearOff = $codeGenerator->IsSVGTypeNeedingTearOffForType($idlType) && $interfaceName !~ /List$/;
             my $shouldPassByReference = $isTearOff || ShouldPassWrapperByReference($parameter, $interface);
 
@@ -4473 +4440 @@
             my $argumentLookupMethod = $parameter->isOptional ? "argument" : "uncheckedArgument";
 
-            if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($type) || $codeGenerator->IsTypedArrayType($type))) {
+            if (!$shouldPassByReference && ($codeGenerator->IsWrapperType($idlType) || $codeGenerator->IsTypedArrayType($idlType))) {
                 $implIncludes{"<runtime/Error.h>"} = 1;
                 my $checkedArgument = "state->$argumentLookupMethod($argumentIndex)";
@@ -4483 +4450 @@
                 push(@$outputArray, "        RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $mayThrowException;
                 push(@$outputArray, "        if (UNLIKELY(!$name))\n");
-                push(@$outputArray, "            return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
+                push(@$outputArray, "            return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $idlType->name . "\");\n");
                 push(@$outputArray, "    }\n");
                 $value = "WTFMove($name)";
             } else {
-                if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($type, $parameter->default)) {
+                if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($idlType, $parameter->default)) {
                     my $defaultValue = $parameter->default;
 
                     # String-related optimizations.
-                    if ($codeGenerator->IsStringType($type)) {
+                    if ($codeGenerator->IsStringType($idlType)) {
                         my $useAtomicString = $parameter->extendedAttributes->{AtomicString};
                         if ($defaultValue eq "null") {
@@ -4523 +4490 @@
             if ($shouldPassByReference) {
                 push(@$outputArray, "    if (UNLIKELY(!$name))\n");
-                push(@$outputArray, "        return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
+                push(@$outputArray, "        return throwArgumentTypeError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"" . $idlType->name . "\");\n");
                 $value = $isTearOff ? "$name->propertyReference()" : "*$name";
             }
 
-            if ($codeGenerator->IsTypedArrayType($type) and $parameter->type ne "ArrayBuffer") {
+            if ($codeGenerator->IsTypedArrayType($idlType) and $idlType->name ne "ArrayBuffer") {
                $value = $shouldPassByReference ? "$name.releaseNonNull()" : "WTFMove($name)";
-            } elsif ($codeGenerator->IsDictionaryType($type)) {
+            } elsif ($codeGenerator->IsDictionaryType($idlType)) {
                 $value = "WTFMove($name)";
             }
@@ -4540 +4507 @@
     push @arguments, GenerateReturnParameters($function);
     my $functionString = "$functionName(" . join(", ", @arguments) . ")";
-    $functionString = "propagateException(*state, throwScope, $functionString)" if $function->signature->type && $function->signature->type eq "void" && $function->signature->extendedAttributes->{MayThrowException};
+    $functionString = "propagateException(*state, throwScope, $functionString)" if $function->signature->idlType && $function->signature->idlType->name eq "void" && $function->signature->extendedAttributes->{MayThrowException};
 
     return ($functionString, scalar @arguments);
@@ -4558 +4525 @@
 {
     my ($object, $dictionary, $className, $enumerations) = @_;
-
-    my $dictionaryName = $dictionary->name;
 
     # - Add default header template and header protection.
@@ -4578 +4543 @@
     if ($writeDependencies) {
         my @ancestors;
-        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;
+        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;
         }
         push(@depsContent, "$className.h : ", join(" ", map { "$_.idl" } @ancestors), "\n");
@@ -4649 +4614 @@
             my @arguments = ();
             foreach my $parameter (@{$function->parameters}) {
-                push(@arguments, GetNativeTypeForCallbacks($interface, $parameter->type) . " " . $parameter->name);
-            }
-            push(@headerContent, "    virtual " . GetNativeTypeForCallbacks($interface, $function->signature->type) . " " . $function->signature->name . "(" . join(", ", @arguments) . ");\n");
+                push(@arguments, GetNativeTypeForCallbacks($interface, $parameter->idlType) . " " . $parameter->name);
+            }
+            push(@headerContent, "    virtual " . GetNativeTypeForCallbacks($interface, $function->signature->idlType) . " " . $function->signature->name . "(" . join(", ", @arguments) . ");\n");
         }
     }
@@ -4781 +4746 @@
         foreach my $function (@{$interface->functions}) {
             my @params = @{$function->parameters};
-            if ($function->signature->extendedAttributes->{Custom} || GetNativeType($interface, $function->signature->type) ne "bool") {
+            if ($function->signature->extendedAttributes->{Custom} || GetNativeType($interface, $function->signature->idlType) ne "bool") {
                 next;
             }
 
-            AddIncludesForTypeInImpl($function->signature->type);
+            AddToImplIncludesForIDLType($function->signature->idlType);
             my $functionName = $function->signature->name;
-            push(@implContent, "\n" . GetNativeTypeForCallbacks($interface, $function->signature->type) . " ${className}::${functionName}(");
+            push(@implContent, "\n" . GetNativeTypeForCallbacks($interface, $function->signature->idlType) . " ${className}::${functionName}(");
 
             my @args = ();
@@ -4793 +4758 @@
             foreach my $param (@params) {
                 my $paramName = $param->name;
-                AddIncludesForTypeInImpl($param->type, 1);
-                push(@args, GetNativeTypeForCallbacks($interface, $param->type) . " " . $paramName);
+                AddToImplIncludesForIDLType($param->idlType, 1);
+                push(@args, GetNativeTypeForCallbacks($interface, $param->idlType) . " " . $paramName);
             }
             push(@implContent, join(", ", @args));
@@ -4862 +4827 @@
     my $mayThrowLegacyException = $function->signature->extendedAttributes->{MayThrowLegacyException};
 
-    if ($function->signature->type eq "void" || IsReturningPromise($function)) {
+    if ($function->signature->idlType->name eq "void" || IsReturningPromise($function)) {
         if ($nondeterministic) {
             AddToImplIncludes("<replay/InputCursor.h>", "WEB_REPLAY");
@@ -4898 +4863 @@
 
             my $nativeType = GetNativeTypeFromSignature($interface, $function->signature);
-            my $memoizedType = GetNativeTypeForMemoization($interface, $function->signature->type);
+            my $memoizedType = GetNativeTypeForMemoization($interface, $function->signature->idlType);
             my $bindingName = $interface->name . "." . $function->signature->name;
             push(@implContent, $indent . "JSValue result;\n");
@@ -5053 +5018 @@
     my ($interface, $signature) = @_;
 
-    return GetNativeType($interface, $signature->type);
+    return GetNativeType($interface, $signature->idlType);
 }
 
@@ -5082 +5047 @@
 sub GetNativeVectorType
 {
-    my ($interface, $type) = @_;
+    my ($type) = @_;
 
     die "This should only be called for sequence or array types" unless $codeGenerator->IsSequenceOrFrozenArrayType($type);
@@ -5170 +5135 @@
 
     return $IDLTypes{$idlType->name} if exists $IDLTypes{$idlType->name};
-    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);
+    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);
     return "IDLUnion<" . join(", ", GetIDLUnionMemberTypes($interface, $idlType)) . ">" if $idlType->isUnion;
     return "IDLInterface<" . $idlType->name . ">";
@@ -5191 +5156 @@
     my ($interface, $type) = @_;
 
-    return $nativeType{$type} if exists $nativeType{$type};
+    assert("Not a type") if ref($type) ne "domType";
+
+    my $typeName = $type->name;
+
+    return $nativeType{$typeName} if exists $nativeType{$typeName};
 
     return GetEnumerationClassName($type, $interface) if $codeGenerator->IsEnumType($type);
     return GetDictionaryClassName($type, $interface) if $codeGenerator->IsDictionaryType($type);
-
-    my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
+    return GetNativeVectorType($type) if $codeGenerator->IsSequenceOrFrozenArrayType($type);
+
+    my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOffForType($type);
     return "${tearOffType}*" if $tearOffType;
 
-    return "RefPtr<${type}>" if $codeGenerator->IsTypedArrayType($type) and $type ne "ArrayBuffer";
-
-    return GetNativeVectorType($interface, $type) if $codeGenerator->IsSequenceOrFrozenArrayType($type);
-
-    return "${type}*";
+    return "RefPtr<${typeName}>" if $codeGenerator->IsTypedArrayType($type) and $typeName ne "ArrayBuffer";
+    return "${typeName}*";
 }
 
 sub ShouldPassWrapperByReference
 {
-    my $parameter = shift;
-    my $interface = shift;
-
-    my $nativeType = GetNativeType($interface, $parameter->type);
+    my ($parameter, $interface) = @_;
+
+    my $nativeType = GetNativeType($interface, $parameter->idlType);
     return $codeGenerator->ShouldPassWrapperByReference($parameter, $interface) && (substr($nativeType, -1) eq '*' || $nativeType =~ /^RefPtr/);
 }
@@ -5219 +5185 @@
     my $innerType = shift;
 
-    return $nativeType{$innerType} if exists $nativeType{$innerType};
-    return "RefPtr<$innerType>";
+    my $innerTypeName = $innerType->name;
+
+    return $nativeType{$innerTypeName} if exists $nativeType{$innerTypeName};
+    return "RefPtr<$innerTypeName>";
 }
 
@@ -5227 +5195 @@
     my ($interface, $type) = @_;
 
-    return "RefPtr<SerializedScriptValue>&&" if $type eq "SerializedScriptValue";
+    return "RefPtr<SerializedScriptValue>&&" if $type->name eq "SerializedScriptValue";
     return "const String&" if $codeGenerator->IsStringType($type);
     return GetNativeType($interface, $type);
@@ -5241 +5209 @@
 sub GetSVGPropertyTypes
 {
-    my $implType = shift;
+    my $interface = shift;
+
+    my $interfaceName = $interface->name;
 
     my $svgPropertyType;
@@ -5247 +5217 @@
     my $svgNativeType;
 
-    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $implType =~ /SVG/;
-
-    $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implType);
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $interfaceName =~ /SVG/;
+
+    $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOffForType($interface->type);
     return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
 
-    my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implType);
+    my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOffForType($interface->type);
     if ($svgNativeType =~ /SVGPropertyTearOff/) {
         $svgPropertyType = $svgWrappedNativeType;
@@ -5279 +5249 @@
 {
     my $type = shift;
-    return exists $nativeType{$type};
+
+    return exists $nativeType{$type->name};
 }
 
@@ -5310 +5281 @@
     return 1 if $idlType->name eq "Date";
     return 1 if $idlType->name eq "BufferSource";
-    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);
+    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);
     return 0;
 }
@@ -5324 +5295 @@
     my ($interface, $signature, $value, $conditional, $statePointer, $stateReference, $thisObjectReference) = @_;
 
-    my $type = $signature->type;
     my $idlType = $signature->idlType;
 
@@ -5341 +5311 @@
         push(@conversionArguments, "$stateReference");
         push(@conversionArguments, "$value");
-        push(@conversionArguments, GetIntegerConversionConfiguration($signature)) if $codeGenerator->IsIntegerType($type);
-        push(@conversionArguments, GetStringConversionConfiguration($signature)) if $codeGenerator->IsStringType($type);
+        push(@conversionArguments, GetIntegerConversionConfiguration($signature)) if $codeGenerator->IsIntegerType($idlType);
+        push(@conversionArguments, GetStringConversionConfiguration($signature)) if $codeGenerator->IsStringType($idlType);
 
         return ("convert<$IDLType>(" . join(", ", @conversionArguments) . ")", 1);
     }
 
-    if ($type eq "DOMString") {
+    if ($idlType->name eq "DOMString") {
         return ("AtomicString($value.toString($statePointer)->toExistingAtomicString($statePointer))", 1) if $signature->extendedAttributes->{RequiresExistingAtomicString};
         return ("$value.toString($statePointer)->toAtomicString($statePointer)", 1) if $signature->extendedAttributes->{AtomicString};
@@ -5353 +5323 @@
     }
 
-    if ($type eq "SerializedScriptValue") {
+    if ($idlType->name eq "SerializedScriptValue") {
         AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return ("SerializedScriptValue::create($stateReference, $value)", 1);
     }
 
-    if ($type eq "Dictionary") {
+    if ($idlType->name eq "Dictionary") {
         AddToImplIncludes("Dictionary.h", $conditional);
         return ("Dictionary($statePointer, $value)", 0);
     }
 
-    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);
+    AddToImplIncludesForIDLType($idlType, $conditional);
+
+    return ("to@{[$idlType->name]}($value)", 1) if $codeGenerator->IsTypedArrayType($idlType);
+    return ("parseEnumeration<" . GetEnumerationClassName($idlType, $interface) . ">($stateReference, $value)", 1) if $codeGenerator->IsEnumType($idlType);
 
     # FIXME: EventListener should be a callback interface.
-    return "JSEventListener::create($value, $thisObjectReference, false, currentWorld($statePointer))" if $type eq "EventListener";
-
-    my $extendedAttributes = $codeGenerator->getInterfaceExtendedAttributesFromName($type);
-    return ("JS${type}::toWrapped($stateReference, $value)", 1) if $type eq "XPathNSResolver";
-    return ("JS${type}::toWrapped($value)", 0);
+    return "JSEventListener::create($value, $thisObjectReference, false, currentWorld($statePointer))" if $idlType->name eq "EventListener";
+
+    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);
 }
 
@@ -5387 +5353 @@
     return 1 if $idlType->name eq "boolean";
     return 1 if $idlType->name eq "Date";
-    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);
+    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);
     return 1 if $idlType->isUnion;
-    return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
 
     return 0;
@@ -5403 +5369 @@
     # FIXME: This should actually check if all the sub-objects of the union need the state.
     return 1 if $idlType->isUnion;
-    return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
-    return 1 if $codeGenerator->IsStringType($idlType->name);
-    return 1 if $codeGenerator->IsEnumType($idlType->name);
+    return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
+    return 1 if $codeGenerator->IsStringType($idlType);
+    return 1 if $codeGenerator->IsEnumType($idlType);
     return 1 if $idlType->name eq "Date";
 
@@ -5417 +5383 @@
     # FIXME: This should actually check if all the sub-objects of the union need the global object.
     return 1 if $idlType->isUnion;
-    return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType->name);
+    return 1 if $codeGenerator->IsSequenceOrFrozenArrayType($idlType);
 
     return 0;
@@ -5450 +5416 @@
 
     my $conditional = $signature->extendedAttributes->{Conditional};
-    my $type = $signature->type;
     my $idlType = $signature->idlType;
     my $isNullable = $signature->isNullable;
@@ -5457 +5422 @@
     # We could instead overload a function to work with optional as well as non-optional numbers, but this
     # is slightly better because it guarantees we will fail to compile if the IDL file doesn't match the C++.
-    if ($signature->extendedAttributes->{Reflect} and ($type eq "unsigned long" or $type eq "unsigned short")) {
+    if ($signature->extendedAttributes->{Reflect} and ($idlType->name eq "unsigned long" or $idlType->name eq "unsigned short")) {
         $value =~ s/getUnsignedIntegralAttribute/getIntegralAttribute/g;
         $value = "std::max(0, $value)";
     }
 
-    if ($type eq "any") {
+    if ($idlType->name eq "any") {
         my $returnType = $signature->extendedAttributes->{ImplementationReturnType};
         if (defined $returnType and ($returnType eq "IDBKeyPath" or $returnType eq "IDBKey")) {
@@ -5485 +5450 @@
     }
 
-    if ($type eq "SerializedScriptValue") {
+    if ($idlType->name eq "SerializedScriptValue") {
         AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return "$value ? $value->deserialize($stateReference, $globalObject) : jsNull()";
     }
 
-    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);
-
-    return $value if $codeGenerator->IsSVGAnimatedType($type);
-
-    if ($codeGenerator->IsSVGAnimatedType($interface->name) or ($interface->name eq "SVGViewSpec" and $type eq "SVGTransformList")) {
+    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);
+
+    return $value if $codeGenerator->IsSVGAnimatedType($idlType);
+
+    if ($codeGenerator->IsSVGAnimatedType($interface->type) or ($interface->name eq "SVGViewSpec" and $idlType->name eq "SVGTransformList")) {
         # Convert from abstract RefPtr<ListProperty> to real type, so the right toJS() method can be invoked.
-        $value = "static_cast<" . GetNativeType($interface, $type) . ">($value.get())";
+        $value = "static_cast<" . GetNativeType($interface, $idlType) . ">($value.get())";
     } elsif ($interface->name eq "SVGViewSpec") {
         # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
-        $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}) {
+        $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}) {
             my $getter = $value;
             $getter =~ s/impl\.//;
@@ -5511 +5476 @@
             my $updateMethod = "&" . $interface->name . "::update" . $codeGenerator->WK_ucfirst($getter);
 
-            my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOff($interface->name);
+            my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOffForType($interface->type);
             if ($selfIsTearOffType) {
                 # FIXME: Why SVGMatrix specifically?
@@ -5728 +5693 @@
         my $checkType = $include;
         $checkType =~ s/\.h//;
-        next if $codeGenerator->IsSVGAnimatedType($checkType);
+        next if $codeGenerator->IsSVGAnimatedTypeName($checkType);
 
         $include = "\"$include\"" unless $include =~ /^["<]/; # "
@@ -6058 +6023 @@
     # so we should be able to use our parent's interface object no matter what. However, some of our IDL files (e.g. CanvasRenderingContext2D)
     # are not valid so we need this check for now.
-    if ($interface->parent && !$codeGenerator->getInterfaceExtendedAttributesFromName($interface->parent)->{NoInterfaceObject}) {
+    if ($interface->parent && !$codeGenerator->GetInterfaceExtendedAttributesFromName($interface->parent)->{NoInterfaceObject}) {
         my $parentClassName = "JS" . $interface->parent;
         push(@$outputArray, "    return ${parentClassName}::getConstructor(vm, &globalObject);\n");
@@ -6138 +6103 @@
 {
     my $function = shift;
-    return $function->signature->type && $function->signature->type eq "Promise";
+    return $function->signature->idlType && $function->signature->idlType->name eq "Promise";
 }
 

trunk/Source/WebCore/bindings/scripts/IDLParser.pm

@@ -55 +55 @@
 struct( domInterface => {
     name => '$',      # Class identifier
+    type => '$',      # Class type
     parent => '$',      # Parent class identifier
-    parents => '@',      # Parent class identifiers (Kept for compatibility with ObjC bindings)
+    parentType => '$',      # Parent class type
     constants => '@',    # List of 'domConstant'
     functions => '@',    # List of 'domFunction'
@@ -91 +92 @@
     direction => '$',   # Variable direction (in or out)
     name => '$',        # Variable name
-    type => '$',        # Variable type name (DEPRECATED - please use idlType)
     idlType => '$',     # Variable type
     specials => '@',    # Specials
@@ -123 +123 @@
 # Used to represent string constants
 struct( domConstant => {
-    name => '$',        # DOM Constant identifier
-    type => '$',        # Type of data
-    value => '$',       # Constant value
+    name => '$', # DOM Constant identifier
+    type => '$', # Type name of data
+    value => '$', # Constant value
     extendedAttributes => '$', # Extended attributes
 });
@@ -132 +132 @@
 struct( domEnum => {
     name => '$', # Enumeration identifier
+    type => '$', # Enumeration type
     values => '@', # Enumeration values (list of unique strings)
     extendedAttributes => '$',
@@ -137 +138 @@
 
 struct( domDictionary => {
-    parent => '$',  # Parent class identifier
-    name => '$',
+    name => '$', # Dictionary identifier
+    type => '$', # Dictionary type
+    parent => '$',  # Parent identifier
+    parentType => '$',  # Parent type identifier
     members => '@', # List of 'domSignature'
     extendedAttributes => '$',
@@ -361 +364 @@
     my $type = shift;
     $type =~ s/^_//;
+    return $type;
+}
+
+sub makeSimpleType
+{
+    my $typeName = shift;
+
+    my $type = domType->new();
+    $type->name($typeName);
+    
     return $type;
 }
@@ -478 +491 @@
     my $numberOfSubtypes = scalar @{$signature->idlType->subtypes};
     if ($numberOfSubtypes) {
-        my $typeUpdated = 0;
-    
         for my $i (0..$numberOfSubtypes - 1) {
             my $subtype = @{$signature->idlType->subtypes}[$i];
@@ -493 +504 @@
                 
                 @{$signature->idlType->subtypes}[$i] = $clonedType;
-                
-                $typeUpdated = 1;
-            }
-        }
-
-        # 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);
             }
         }
@@ -525 +519 @@
 
         $signature->idlType($clonedType);
-        $signature->type($clonedType->name);
         $signature->isNullable($clonedType->isNullable);
 
@@ -606 +599 @@
         my $interfaceNameToken = $self->getToken();
         $self->assertTokenType($interfaceNameToken, IdentifierToken);
-        $interface->name(identifierRemoveNullablePrefix($interfaceNameToken->value()));
-        my $parents = $self->parseInheritance();
-        $interface->parents($parents);
-        $interface->parent($parents->[0]);
+        
+        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));
+        }
+
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $interfaceMembers = $self->parseInterfaceMembers();
@@ -716 +717 @@
         $dictionary->extendedAttributes($extendedAttributeList);
         $self->assertTokenValue($self->getToken(), "dictionary", __LINE__);
+
         my $nameToken = $self->getToken();
         $self->assertTokenType($nameToken, IdentifierToken);
-        $dictionary->name($nameToken->value());
-        my $parents = $self->parseInheritance();
-        $dictionary->parent($parents->[0]);
+
+        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));
+        }
+        
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         $dictionary->members($self->parseDictionaryMembers());
@@ -767 +778 @@
         my $type = $self->parseType();
         $member->idlType($type);
-        $member->type($type->name);
         $member->isNullable($type->isNullable);
 
@@ -836 +846 @@
         my $exceptionNameToken = $self->getToken();
         $self->assertTokenType($exceptionNameToken, IdentifierToken);
-        $interface->name(identifierRemoveNullablePrefix($exceptionNameToken->value()));
+
+        my $name = identifierRemoveNullablePrefix($exceptionNameToken->value());
+        $interface->name($name);
+        $interface->type(makeSimpleType($name));
         $interface->isException(1);
-        my $parents = $self->parseInheritance();
-        $interface->parents($parents);
-        $interface->parent($parents->[0]);
+
+        $next = $self->nextToken();
+        if ($next->value() eq ":") {
+            my $parent = $self->parseInheritance();
+            $interface->parent($parent);
+            $interface->parentType(makeSimpleType($parent));
+        }
+        
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $exceptionMembers = $self->parseExceptionMembers();
@@ -876 +894 @@
 {
     my $self = shift;
-    my @parent = ();
 
     my $next = $self->nextToken();
     if ($next->value() eq ":") {
         $self->assertTokenValue($self->getToken(), ":", __LINE__);
-        my $name = $self->parseName();
-        push(@parent, $name);
-
-        # FIXME: Remove. Was needed for needed for ObjC bindings.
-        push(@parent, @{$self->parseIdentifiers()});
-    }
-    return \@parent;
+        return $self->parseName();
+    }
+    $self->assertUnexpectedToken($next->value(), __LINE__);
 }
 
@@ -901 +914 @@
         my $enumNameToken = $self->getToken();
         $self->assertTokenType($enumNameToken, IdentifierToken);
-        $enum->name(identifierRemoveNullablePrefix($enumNameToken->value()));
+        my $name = identifierRemoveNullablePrefix($enumNameToken->value());
+        $enum->name($name);
+        $enum->type(makeSimpleType($name));
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         push(@{$enum->values}, @{$self->parseEnumValueList()});
@@ -1016 +1031 @@
         my $newDataNode = domConstant->new();
         $self->assertTokenValue($self->getToken(), "const", __LINE__);
-        
         my $type = $self->parseConstType();
-        $newDataNode->type($type->name);
-
+        $newDataNode->type($type);
         my $constNameToken = $self->getToken();
         $self->assertTokenType($constNameToken, IdentifierToken);
@@ -1287 +1300 @@
         if (defined ($interface)) {
             $interface->signature->idlType($returnType);
-            $interface->signature->type($returnType->name);
             $interface->signature->isNullable($returnType->isNullable);
         }
@@ -1327 +1339 @@
         my $type = $self->parseType();
         $newDataNode->signature->idlType($type);
-        $newDataNode->signature->type($type->name);
         $newDataNode->signature->isNullable($type->isNullable);
 
@@ -1385 +1396 @@
             my $operation = $self->parseOperationRest($extendedAttributeList);
             $operation->signature->idlType($returnType);
-            $operation->signature->type($returnType->name);
             $operation->signature->isNullable($returnType->isNullable);
 
@@ -1407 +1417 @@
         if (defined ($interface)) {
             $interface->signature->idlType($returnType);
-            $interface->signature->type($returnType->name);
             $interface->signature->isNullable($returnType->isNullable);
             $interface->signature->specials(\@specials);
@@ -1505 +1514 @@
     my $forEachArgument = domSignature->new();
     $forEachArgument->name("callback");
-    $forEachArgument->type("any");
+    $forEachArgument->idlType(makeSimpleType("any"));
     push(@{$forEachFunction->parameters}, ($forEachArgument));
 
@@ -1628 +1637 @@
         my $type = $self->parseType();
         $paramDataNode->idlType($type);
-        $paramDataNode->type(identifierRemoveNullablePrefix($type->name));
         $paramDataNode->isNullable($type->isNullable);
         $paramDataNode->isOptional(1);
@@ -1638 +1646 @@
         my $type = $self->parseType();
         $paramDataNode->idlType($type);
-        $paramDataNode->type($type->name);
         $paramDataNode->isNullable($type->isNullable);
         $paramDataNode->isOptional(0);
@@ -1701 +1708 @@
         my $type = $self->parseType();
         $newDataNode->signature->idlType($type);
-        $newDataNode->signature->type($type->name);
         $newDataNode->signature->isNullable($type->isNullable);
         
@@ -2117 +2123 @@
         $self->assertTokenValue($self->getToken(), ">", __LINE__);
 
-        # FIXME: This should just be "sequence" when we start using domTypes in the CodeGenerators
-        $type->name("sequence<${subtypeName}>");
+        $type->name("sequence");
         push(@{$type->subtypes}, $subtype);
 
@@ -2132 +2137 @@
         $self->assertTokenValue($self->getToken(), ">", __LINE__);
 
-        # FIXME: This should just be "FrozenArray" when we start using domTypes in the CodeGenerators
-        $type->name("FrozenArray<${subtypeName}>");
+        $type->name("FrozenArray");
         push(@{$type->subtypes}, $subtype);
 
@@ -2350 +2354 @@
     # here to determine serializability: https://heycam.github.io/webidl/#idl-serializers
     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)$';
-    return $attribute->signature->type =~ /$serializable_types/;
+    return $attribute->signature->idlType->name =~ /$serializable_types/;
 }
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp

@@ -27 +27 @@
 #include "JSDOMConvert.h"
 #include "JSNode.h"
-#include "Node.h"
 #include "wtf/text/AtomicString.h"
 #include <runtime/Error.h>

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

@@ -29 +29 @@
 #include "JSDOMConstructor.h"
 #include "JSDOMConvert.h"
-#include "TestObj.h"
+#include "JSTestObj.h"
 #include "TestSupplemental.h"
 #include <runtime/Error.h>
@@ -41 +41 @@
 #if ENABLE(Condition11) || ENABLE(Condition12) || ENABLE(Condition22) || ENABLE(Condition23)
 #include "JSNode.h"
-#include "JSTestObj.h"
 #endif
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -23 +23 @@
 
 #include "CallbackFunction.h"
-#include "DOMStringList.h"
 #include "Dictionary.h"
 #include "Document.h"
-#include "Element.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
@@ -57 +55 @@
 #include "JSXPathNSResolver.h"
 #include "RuntimeEnabledFeatures.h"
-#include "SVGDocument.h"
-#include "SVGPoint.h"
 #include "SVGStaticPropertyTearOff.h"
 #include "SerializedScriptValue.h"

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp

@@ -28 +28 @@
 #include <runtime/Error.h>
 #include <runtime/FunctionPrototype.h>
+#include <runtime/JSArray.h>
 #include <wtf/GetPtr.h>
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp

@@ -27 +27 @@
 #include "JSDOMConvert.h"
 #include "JSNode.h"
-#include "Node.h"
 #include "wtf/text/AtomicString.h"
 #include <runtime/Error.h>

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

@@ -31 +31 @@
 #include "SerializedScriptValue.h"
 #include <runtime/FunctionPrototype.h>
+#include <runtime/JSArray.h>
 #include <wtf/GetPtr.h>
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp

@@ -30 +30 @@
 #include "JSTestEventTarget.h"
 #include "JSTestSubObj.h"
-#include "SVGPoint.h"
 #include "SerializedScriptValue.h"
 #include <runtime/Error.h>

trunk/Source/WebCore/html/HTMLEmbedElement.idl

@@ -24 +24 @@
     CustomCall,
 ] interface HTMLEmbedElement : HTMLElement {
-[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;
+    [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;
 
-[CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
+    [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
 };
 

trunk/Source/WebCore/html/HTMLFrameElement.idl

@@ -38 +38 @@
     readonly attribute DOMWindow contentWindow;
 
-    [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
+    [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
 
     // FIXME: No other browser has this attribute.

trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp

@@ -113 +113 @@
 }
 
-SVGDocument* HTMLFrameOwnerElement::getSVGDocument(ExceptionCode& ec) const
+Document* HTMLFrameOwnerElement::getSVGDocument(ExceptionCode& ec) const
 {
     Document* document = contentDocument();

trunk/Source/WebCore/html/HTMLFrameOwnerElement.h

@@ -50 +50 @@
     RenderWidget* renderWidget() const;
 
-    SVGDocument* getSVGDocument(ExceptionCode&) const;
+    Document* getSVGDocument(ExceptionCode&) const;
 
     virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }

trunk/Source/WebCore/html/HTMLIFrameElement.idl

@@ -42 +42 @@
     readonly attribute DOMWindow contentWindow;
 
-    [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
+    [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
 };
 

trunk/Source/WebCore/html/HTMLObjectElement.idl

@@ -51 +51 @@
     [CheckSecurityForNode] readonly attribute Document contentDocument;
 
-    [CheckSecurityForNode, MayThrowLegacyException] SVGDocument getSVGDocument();
+    [CheckSecurityForNode, MayThrowLegacyException] Document getSVGDocument();
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2016-10-27  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm

@@ -64 +64 @@
 {
     my ($self, $idlType) = @_;
+
     return $$self{codeGenerator}->WK_lcfirst(_implementationClassName($idlType)) . "Class";
 }
@@ -142 +143 @@
     my @contents = ();
 
-    my $idlType = $interface->name;
+    my $idlType = $interface->type;
     my $className = _className($idlType);
     my $implementationClassName = _implementationClassName($idlType);
@@ -209 +210 @@
     my @contents = ();
 
-    my $idlType = $interface->name;
+    my $idlType = $interface->type;
     my $className = _className($idlType);
     my $implementationClassName = _implementationClassName($idlType);
@@ -284 +285 @@
                 my @specifiedParameters = @{$function->parameters};
 
-                $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
+                $self->_includeHeaders(\%contentsIncludes, $function->signature->idlType, $function->signature);
 
                 if ($function->signature->extendedAttributes->{"PassContext"}) {
@@ -303 +304 @@
             }
             
-            push(@contents, "    ${functionCall};\n\n") if $function->signature->type eq "void";
+            push(@contents, "    ${functionCall};\n\n") if $function->signature->idlType->name eq "void";
             push(@contents, "    return " . $self->_returnExpression($function->signature, $functionCall) . ";\n}\n");
         }
@@ -311 +312 @@
         push(@contents, "\n// Attributes\n");
         foreach my $attribute (@attributes) {
-            $self->_includeHeaders(\%contentsIncludes, $attribute->signature->type, $attribute->signature);
+            $self->_includeHeaders(\%contentsIncludes, $attribute->signature->idlType, $attribute->signature);
 
             my $getterName = $self->_getterName($attribute);
@@ -368 +369 @@
     my ($self, $attribute) = @_;
 
-    my $signature = $attribute->signature;
-    my $name = $signature->name;
-
-    return $name;
+    return $attribute->signature->name;
 }
 
@@ -379 +377 @@
 
     return unless defined $idlType;
-    return if $idlType eq "boolean";
-    return if $idlType eq "object";
+    return if $idlType->name eq "boolean";
+    return if $idlType->name eq "object";
     return if $$self{codeGenerator}->IsNonPointerType($idlType);
     return if $$self{codeGenerator}->IsStringType($idlType);
@@ -392 +390 @@
     my ($idlType) = @_;
 
-    return $idlType;
+    return $idlType->name;
 }
 
@@ -414 +412 @@
 {
     my ($interface) = @_;
-    return $interface->parent;
+    return $interface->parentType;
 }
 
@@ -423 +421 @@
     return undef unless defined $idlType;
 
-    return "bool" if $idlType eq "boolean";
-    return "JSValueRef" if $idlType eq "object";
+    return "bool" if $idlType->name eq "boolean";
+    return "JSValueRef" if $idlType->name eq "object";
     return "JSRetainPtr<JSStringRef>" if $$self{codeGenerator}->IsStringType($idlType);
     return "double" if $$self{codeGenerator}->IsNonPointerType($idlType);
@@ -434 +432 @@
     my ($self, $signature, $argumentName) = @_;
 
-    my $idlType = $signature->type;
+    my $idlType = $signature->idlType;
 
     return "JSValueToBoolean(context, $argumentName)" if $idlType eq "boolean";
-    return "$argumentName" if $idlType eq "object";
+    return "$argumentName" if $idlType->name eq "object";
     return "JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, $argumentName, 0))" if $$self{codeGenerator}->IsStringType($idlType);
     return "JSValueToNumber(context, $argumentName, 0)" if $$self{codeGenerator}->IsNonPointerType($idlType);
@@ -447 +445 @@
     my ($self, $signature, $variableName, $argumentName, $condition) = @_;
 
-    my $platformType = $self->_platformType($signature->type, $signature);
+    my $platformType = $self->_platformType($signature->idlType, $signature);
     my $constructor = $self->_platformTypeConstructor($signature, $argumentName);
 
@@ -475 +473 @@
     my ($self, $signature, $expression) = @_;
 
-    my $returnIDLType = $signature->type;
-
-    return "JSValueMakeUndefined(context)" if $returnIDLType eq "void";
-    return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType eq "boolean";
-    return "${expression}" if $returnIDLType eq "object";
+    my $returnIDLType = $signature->idlType;
+
+    return "JSValueMakeUndefined(context)" if $returnIDLType->name eq "void";
+    return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType->name eq "boolean";
+    return "${expression}" if $returnIDLType->name eq "object";
     return "JSValueMakeNumber(context, ${expression})" if $$self{codeGenerator}->IsNonPointerType($returnIDLType);
     return "JSValueMakeStringOrNull(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnIDLType);
@@ -489 +487 @@
     my ($self, $parameter) = @_;
 
-    my $idlType = $parameter->type;
+    my $idlType = $parameter->idlType;
     my $name = $parameter->name;
 
@@ -524 +522 @@
     my ($self, $interface, $functionOrValue, $arrayTerminator, $mapFunction, $functionsOrAttributes) = @_;
 
-    my $className = _className($interface->name);
+    my $className = _className($interface->type);
     my $uppercaseFunctionOrValue = $$self{codeGenerator}->WK_ucfirst($functionOrValue);
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm

@@ -29 +29 @@
 package CodeGeneratorTestRunner;
 
+use Carp qw<longmess>;
+use Data::Dumper;
+
+sub assert
+{
+    my $message = shift;
+    
+    my $mess = longmess();
+    print Dumper($mess);
+
+    die $message;
+}
+
 sub new
 {
@@ -58 +71 @@
 {
     my ($idlType) = @_;
+
+    assert("Not a type") if ref($idlType) ne "domType";
 
     return "JS" . _implementationClassName($idlType);
@@ -143 +158 @@
     my @contents = ();
 
-    my $idlType = $interface->name;
+    my $idlType = $interface->type;
     my $className = _className($idlType);
     my $implementationClassName = _implementationClassName($idlType);
@@ -210 +225 @@
     my @contents = ();
 
-    my $idlType = $interface->name;
+    my $idlType = $interface->type;
     my $className = _className($idlType);
     my $implementationClassName = _implementationClassName($idlType);
@@ -245 +260 @@
     if (!jsClass) {
         JSClassDefinition definition = kJSClassDefinitionEmpty;
-        definition.className = "${idlType}";
+        definition.className = "@{[$idlType->name]}";
         definition.parentClass = @{[$self->_parentClassRefGetterExpression($interface)]};
         definition.staticValues = staticValues();
@@ -285 +300 @@
                 my @specifiedParameters = @{$function->parameters};
 
-                $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
+                $self->_includeHeaders(\%contentsIncludes, $function->signature->idlType, $function->signature);
 
                 if ($function->signature->extendedAttributes->{"PassContext"}) {
@@ -304 +319 @@
             }
             
-            push(@contents, "    ${functionCall};\n\n") if $function->signature->type eq "void";
+            push(@contents, "    ${functionCall};\n\n") if $function->signature->idlType->name eq "void";
             push(@contents, "    return " . $self->_returnExpression($function->signature, $functionCall) . ";\n}\n");
         }
@@ -312 +327 @@
         push(@contents, "\n// Attributes\n");
         foreach my $attribute (@attributes) {
-            $self->_includeHeaders(\%contentsIncludes, $attribute->signature->type, $attribute->signature);
+            $self->_includeHeaders(\%contentsIncludes, $attribute->signature->idlType, $attribute->signature);
 
             my $getterName = $self->_getterName($attribute);
@@ -369 +384 @@
     my ($self, $attribute) = @_;
 
-    my $signature = $attribute->signature;
-    my $name = $signature->name;
-
-    return $name;
+    return $attribute->signature->name;
 }
 
@@ -380 +392 @@
 
     return unless defined $idlType;
-    return if $idlType eq "boolean";
-    return if $idlType eq "object";
+    return if $idlType->name eq "boolean";
+    return if $idlType->name eq "object";
     return if $$self{codeGenerator}->IsNonPointerType($idlType);
     return if $$self{codeGenerator}->IsStringType($idlType);
@@ -393 +405 @@
     my ($idlType) = @_;
 
-    return $idlType;
+    return $idlType->name;
 }
 
@@ -415 +427 @@
 {
     my ($interface) = @_;
-    return $interface->parent;
+    return $interface->parentType;
 }
 
@@ -424 +436 @@
     return undef unless defined $idlType;
 
-    return "bool" if $idlType eq "boolean";
-    return "JSValueRef" if $idlType eq "object";
+    return "bool" if $idlType->name eq "boolean";
+    return "JSValueRef" if $idlType->name eq "object";
     return "JSRetainPtr<JSStringRef>" if $$self{codeGenerator}->IsStringType($idlType);
     return "double" if $$self{codeGenerator}->IsNonPointerType($idlType);
@@ -435 +447 @@
     my ($self, $signature, $argumentName) = @_;
 
-    my $idlType = $signature->type;
-
-    return "JSValueToBoolean(context, $argumentName)" if $idlType eq "boolean";
-    return "$argumentName" if $idlType eq "object";
+    my $idlType = $signature->idlType;
+
+    return "JSValueToBoolean(context, $argumentName)" if $idlType->name eq "boolean";
+    return "$argumentName" if $idlType->name eq "object";
     return "JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, $argumentName, 0))" if $$self{codeGenerator}->IsStringType($idlType);
     return "JSValueToNumber(context, $argumentName, 0)" if $$self{codeGenerator}->IsNonPointerType($idlType);
@@ -448 +460 @@
     my ($self, $signature, $variableName, $argumentName, $condition) = @_;
 
-    my $platformType = $self->_platformType($signature->type, $signature);
+    my $platformType = $self->_platformType($signature->idlType, $signature);
     my $constructor = $self->_platformTypeConstructor($signature, $argumentName);
 
@@ -476 +488 @@
     my ($self, $signature, $expression) = @_;
 
-    my $returnIDLType = $signature->type;
-
-    return "JSValueMakeUndefined(context)" if $returnIDLType eq "void";
-    return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType eq "boolean";
-    return "${expression}" if $returnIDLType eq "object";
+    my $returnIDLType = $signature->idlType;
+
+    return "JSValueMakeUndefined(context)" if $returnIDLType->name eq "void";
+    return "JSValueMakeBoolean(context, ${expression})" if $returnIDLType->name eq "boolean";
+    return "${expression}" if $returnIDLType->name eq "object";
     return "JSValueMakeNumber(context, ${expression})" if $$self{codeGenerator}->IsNonPointerType($returnIDLType);
     return "JSValueMakeStringOrNull(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnIDLType);
@@ -490 +502 @@
     my ($self, $parameter) = @_;
 
-    my $idlType = $parameter->type;
+    my $idlType = $parameter->idlType;
     my $name = $parameter->name;
 
@@ -525 +537 @@
     my ($self, $interface, $functionOrValue, $arrayTerminator, $mapFunction, $functionsOrAttributes) = @_;
 
-    my $className = _className($interface->name);
+    my $className = _className($interface->type);
     my $uppercaseFunctionOrValue = $$self{codeGenerator}->WK_ucfirst($functionOrValue);