Ready for latest WebIDL for named property getters.

Source/bindings/scripts/CodeGeneratorV8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 257 matching lines @@
         $headerIncludes{"SVGPathSegListPropertyTearOff.h"} = 1;
     }
 
     if ($svgPropertyType) {
         $svgPropertyType = "SVGPoint" if $svgPropertyType eq "FloatPoint";
     }
 
     return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
 }
 
+sub GetNamedGetterFunction
+{
+    my $interface = shift;
+
+    foreach my $function (@{$interface->functions}) {
+        my $specials = $function->signature->specials;
+        my $getterExists = grep { $_ eq "getter" } @$specials;
+        my $parameters = $function->parameters;
+        if ($getterExists and scalar(@$parameters)==1 and $parameters->[0]->type eq "DOMString" ) {

[haraken, 2013/04/26 12:09:52]

Nit: Spaces needed around '=='

+            return $function;
+        }
+    }
+    return 0;
+}
+
 sub GenerateHeader
 {
     my $object = shift;
     my $interface = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
     # Copy contents of parent interfaces except the first parent.
     my @parents;
@@ skipping 424 matching lines @@
     "HTMLEmbedElement" => 1,
     "HTMLObjectElement" => 1
 );
 
 sub GenerateHeaderNamedAndIndexedPropertyAccessors
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $hasIndexedGetter = $interface->extendedAttributes->{"IndexedGetter"} || $interface->extendedAttributes->{"CustomIndexedGetter"};
     my $hasCustomIndexedSetter = $interface->extendedAttributes->{"CustomIndexedSetter"};
-    my $hasCustomNamedGetter = $interface->extendedAttributes->{"NamedGetter"} || $interface->extendedAttributes->{"CustomNamedGetter"} || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
+    my $hasCustomNamedGetter = GetNamedGetterFunction($interface) || $interface->extendedAttributes->{"CustomNamedGetter"} || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
     my $hasCustomNamedSetter = $interface->extendedAttributes->{"CustomNamedSetter"};
     my $hasCustomDeleters = $interface->extendedAttributes->{"CustomDeleteProperty"};
     my $hasCustomEnumerator = $interface->extendedAttributes->{"CustomEnumerateProperty"};
     if ($interfaceName eq "HTMLOptionsCollection") {
         $interfaceName = "HTMLCollection";
         $hasIndexedGetter = 1;
         $hasCustomNamedGetter = 1;
     }
     if ($interfaceName eq "DOMWindow") {
         $hasCustomDeleters = 0;
@@ skipping 2176 matching lines @@
     return $jsValue;
 }
 END
     }
     return $code;
 }
 
 sub GenerateImplementationNamedPropertyGetter
 {
     my $interface = shift;
-    my $namedPropertyGetter = shift;
+
     my $subCode = "";
-
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
-    if (!$namedPropertyGetter) {
-        $namedPropertyGetter = $codeGenerator->FindSuperMethod($interface, "namedItem");
-    }
-
-    if ($interface->extendedAttributes->{"NamedGetter"}) {
-        die "$interfaceName: [NamedGetter] but no namedItem() method." if (!$namedPropertyGetter);
+    my $function = GetNamedGetterFunction($interface);
+    if ($function) {
+        my $returnType = $function->signature->type;
+        my $methodName = $function->signature->name;
         AddToImplIncludes("V8Collection.h");
-        my $type = $namedPropertyGetter->type;
+        AddToImplIncludes("V8$returnType.h");
         $subCode .= <<END;
     desc->InstanceTemplate()->SetNamedPropertyHandler(${v8InterfaceName}::namedPropertyGetter, 0, 0, 0, 0);
 END
 
         my $code .= <<END;
 v8::Handle<v8::Value> ${v8InterfaceName}::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
 {
     if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
         return v8Undefined();
     if (info.Holder()->HasRealNamedCallbackProperty(name))
         return v8Undefined();
 
     v8::Local<v8::Object> object = info.Holder();
-    v8::Handle<v8::Object> creationContext = info.Holder();
-    v8::Isolate* isolate = info.GetIsolate();
-
     ASSERT(V8DOMWrapper::maybeDOMWrapper(object));
     ASSERT(toWrapperTypeInfo(object) != &V8Node::info);
     $interfaceName* collection = toNative(object);
 
     AtomicString propertyName = toWebCoreAtomicStringWithNullCheck(name);
-    RefPtr<$type> element = collection->namedItem(propertyName);
+    RefPtr<$returnType> element = collection->$methodName(propertyName);
 
     if (!element)
         return v8Undefined();
 
-    return toV8(element.release(), creationContext, isolate);
+    return toV8Fast(element.release(), info, collection);
 }
 
 END
         AddToImplContent($code);
     }
 
     my $hasCustomNamedGetter = $interface->extendedAttributes->{"CustomNamedGetter"};
     # FIXME: make consistent between IDL and implementation. Then remove these special cases.
     $hasCustomNamedGetter = 1 if $interfaceName eq "HTMLAppletElement";
     $hasCustomNamedGetter = 1 if $interfaceName eq "HTMLEmbedElement";
@@ skipping 236 matching lines @@
     v8::Handle<v8::Object> wrapper = ${v8InterfaceName}::createWrapper(impl, creationContext, isolate);
     if (!wrapper.IsEmpty())
         wrapper->SetIndexedPropertiesToExternalArrayData(impl->baseAddress(), $viewType, impl->length());
     return wrapper;
 }
 
 END
     }
 
     my $indexer;
-    my $namedPropertyGetter;
     my @enabledPerContextFunctions;
     my @normalFunctions;
     my $needsDomainSafeFunctionSetter = 0;
     # Generate methods for functions.
     foreach my $function (@{$interface->functions}) {
         GenerateFunction($function, $interface, "");
         if ($function->signature->extendedAttributes->{"PerWorldBindings"}) {
             GenerateFunction($function, $interface, "ForMainWorld");
         }
         if ($function->{overloadIndex} == @{$function->{overloads}}) {
             if ($function->{overloadIndex} > 1) {
                 GenerateOverloadedFunction($function, $interface, "");
                 if ($function->signature->extendedAttributes->{"PerWorldBindings"}) {
                     GenerateOverloadedFunction($function, $interface, "ForMainWorld");
                 }
             }
             GenerateFunctionCallback($function, $interface, "");
             if ($function->signature->extendedAttributes->{"PerWorldBindings"}) {
                 GenerateFunctionCallback($function, $interface, "ForMainWorld");
             }
         }
 
         if ($function->signature->name eq "item") {
             $indexer = $function->signature;
-        } elsif ($function->signature->name eq "namedItem") {
-            $namedPropertyGetter = $function->signature;
         }
 
         # If the function does not need domain security check, we need to
         # generate an access getter that returns different function objects
         # for different calling context.
         if ($interface->extendedAttributes->{"CheckSecurity"} && $function->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
             if (!HasCustomMethod($function->signature->extendedAttributes) || $function->{overloadIndex} == 1) {
                 GenerateDomainSafeFunctionGetter($function, $interfaceName);
                 $needsDomainSafeFunctionSetter = 1;
             }
@@ skipping 256 matching lines @@
         $code .= "    if (${enable_function}()) {\n";
         $code .= <<END;
         static const V8DOMConfiguration::BatchedConstant constData = {"${name}", static_cast<signed int>(${value})};
         V8DOMConfiguration::batchConfigureConstants(desc, proto, &constData, 1, isolate);
 END
         $code .= "    }\n";
         $code .= "\n#endif // ${conditionalString}\n" if $conditionalString;
     }
 
     $code .= GenerateImplementationIndexedProperty($interface, $indexer);
-    $code .= GenerateImplementationNamedPropertyGetter($interface, $namedPropertyGetter);
+    $code .= GenerateImplementationNamedPropertyGetter($interface);
     $code .= GenerateImplementationCustomCall($interface);
     $code .= GenerateImplementationMasqueradesAsUndefined($interface);
 
     # Define our functions with Set() or SetAccessor()
     my $total_functions = 0;
     foreach my $function (@normalFunctions) {
         # Only one accessor is needed for overloaded methods:
         next if $function->{overloadIndex} > 1;
 
         $total_functions++;
@@ skipping 1352 matching lines @@
 
 sub GetPassRefPtrType
 {
     my $v8InterfaceName = shift;
 
     my $angleBracketSpace = $v8InterfaceName =~ />$/ ? " " : "";
     return "PassRefPtr<${v8InterfaceName}${angleBracketSpace}>";
 }
 
 1;