IDL compiler: [Custom=PropertyEnumerator]

Source/bindings/scripts/code_generator_v8.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 1083 matching lines @@
     my $namedGetterFunction = GetNamedGetterFunction($interface);
     my $hasCustomNamedGetter = $namedGetterFunction && HasCustomPropertyGetter($namedGetterFunction->extendedAttributes);
 
     my $namedSetterFunction = GetNamedSetterFunction($interface);
     my $hasCustomNamedSetter = $namedSetterFunction && $namedSetterFunction->extendedAttributes->{"Custom"};
 
     my $namedDeleterFunction = GetNamedDeleterFunction($interface);
     my $hasCustomNamedDeleter = $namedDeleterFunction && $namedDeleterFunction->extendedAttributes->{"Custom"};
 
     my $namedEnumeratorFunction = $namedGetterFunction && !$namedGetterFunction->extendedAttributes->{"NotEnumerable"};
-    my $hasCustomNamedEnumerator = $namedGetterFunction && ExtendedAttributeContains($namedGetterFunction->extendedAttributes->{"Custom"}, "PropertyEnumerator");
+    my $hasCustomNamedEnumerator = $namedEnumeratorFunction && ExtendedAttributeContains($namedGetterFunction->extendedAttributes->{"Custom"}, "PropertyEnumerator");

[Nils Barth (inactive), 2014/01/30 04:42:41]

Typo fix: should ask for Enumerator, not Getter.

+    my $hasCustomNamedQuery = $namedEnumeratorFunction && ExtendedAttributeContains($namedGetterFunction->extendedAttributes->{"Custom"}, "PropertyQuery");
 
     if ($hasCustomIndexedGetter) {
         $header{classPublic}->add("    static void indexedPropertyGetterCustom(uint32_t, const v8::PropertyCallbackInfo<v8::Value>&);\n");
     }
 
     if ($hasCustomIndexedSetter) {
         $header{classPublic}->add("    static void indexedPropertySetterCustom(uint32_t, v8::Local<v8::Value>, const v8::PropertyCallbackInfo<v8::Value>&);\n");
     }
 
     if ($hasCustomIndexedDeleters) {
         $header{classPublic}->add("    static void indexedPropertyDeleterCustom(uint32_t, const v8::PropertyCallbackInfo<v8::Boolean>&);\n");
     }
 
     if ($hasCustomNamedGetter) {
         $header{classPublic}->add("    static void namedPropertyGetterCustom(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>&);\n");
     }
 
     if ($hasCustomNamedSetter) {
         $header{classPublic}->add("    static void namedPropertySetterCustom(v8::Local<v8::String>, v8::Local<v8::Value>, const v8::PropertyCallbackInfo<v8::Value>&);\n");
     }
 
+    if ($hasCustomNamedQuery) {
+        $header{classPublic}->add("    static void namedPropertyQueryCustom(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Integer>&);\n");
+    }
+
     if ($hasCustomNamedDeleter) {
         $header{classPublic}->add("    static void namedPropertyDeleterCustom(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Boolean>&);\n");
     }
 
     if ($hasCustomNamedEnumerator) {
         $header{classPublic}->add("    static void namedPropertyEnumeratorCustom(const v8::PropertyCallbackInfo<v8::Array>&);\n");
-        $header{classPublic}->add("    static void namedPropertyQueryCustom(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Integer>&);\n");
     }
 }
 
 sub GenerateHeaderLegacyCallAsFunction
 {
     my $interface = shift;
 
     if (ExtendedAttributeContains($interface->extendedAttributes->{"Custom"}, "LegacyCallAsFunction")) {
         $header{classPublic}->add("    static void legacyCallCustom(const v8::FunctionCallbackInfo<v8::Value>&);\n");
     }
@@ skipping 2669 matching lines @@
 
 sub GenerateImplementationNamedPropertyAccessors
 {
     my $interface = shift;
 
     my $interfaceName = $interface->name;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     my $namedGetterFunction = GetNamedGetterFunction($interface);
+    my $namedEnumeratorFunction = $namedGetterFunction && !$namedGetterFunction->extendedAttributes->{"NotEnumerable"};
+
     if ($namedGetterFunction) {
         # includes for return type even if custom
         my $returnType = $namedGetterFunction->type;
         AddIncludesForType($returnType);
         if (IsRefPtrType($returnType)) {
             AddToImplIncludes("wtf/RefPtr.h");
             AddToImplIncludes("wtf/GetPtr.h");
         }
         my $hasCustomNamedGetter = HasCustomPropertyGetter($namedGetterFunction->extendedAttributes);
         if (!$hasCustomNamedGetter) {
             GenerateImplementationNamedPropertyGetter($interface, $namedGetterFunction);
         }
         GenerateImplementationNamedPropertyGetterCallback($interface, $hasCustomNamedGetter);
     }
 
     my $namedSetterFunction = GetNamedSetterFunction($interface);
     if ($namedSetterFunction) {
         AddIncludesForType($namedSetterFunction->parameters->[1]->type);  # includes for argument type even if custom
         my $hasCustomNamedSetter = $namedSetterFunction->extendedAttributes->{"Custom"};
         if (!$hasCustomNamedSetter) {
             GenerateImplementationNamedPropertySetter($interface, $namedSetterFunction);
         }
         GenerateImplementationNamedPropertySetterCallback($interface, $hasCustomNamedSetter);
     }
 
+    if ($namedEnumeratorFunction) {
+        my $hasCustomNamedQuery = ExtendedAttributeContains($namedGetterFunction->extendedAttributes->{"Custom"}, "PropertyQuery");
+        if (!$hasCustomNamedQuery) {
+            GenerateImplementationNamedPropertyQuery($interface);
+        }
+        GenerateImplementationNamedPropertyQueryCallback($interface, $hasCustomNamedQuery);
+    }
+
     my $namedDeleterFunction = GetNamedDeleterFunction($interface);
     if ($namedDeleterFunction) {
         my $hasCustomNamedDeleter = $namedDeleterFunction->extendedAttributes->{"Custom"};
         if (!$hasCustomNamedDeleter) {
             GenerateImplementationNamedPropertyDeleter($interface, $namedDeleterFunction);
         }
         GenerateImplementationNamedPropertyDeleterCallback($interface, $hasCustomNamedDeleter);
     }
 
-    my $namedEnumeratorFunction = $namedGetterFunction && !$namedGetterFunction->extendedAttributes->{"NotEnumerable"};
     if ($namedEnumeratorFunction) {
         my $hasCustomNamedEnumerator = ExtendedAttributeContains($namedGetterFunction->extendedAttributes->{"Custom"}, "PropertyEnumerator");
         if (!$hasCustomNamedEnumerator) {
-            GenerateImplementationNamedPropertyQuery($interface);
-        }
-        GenerateImplementationNamedPropertyQueryCallback($interface, $hasCustomNamedEnumerator);
-        if (!$hasCustomNamedEnumerator) {
             GenerateImplementationNamedPropertyEnumerator($interface);
         }
         GenerateImplementationNamedPropertyEnumeratorCallback($interface, $hasCustomNamedEnumerator);
     }
 
     my $subCode = "";
     if ($namedGetterFunction || $namedSetterFunction || $namedDeleterFunction || $namedEnumeratorFunction) {
         my $setOn = "Instance";
 
         # V8 has access-check callback API (see ObjectTemplate::SetAccessCheckCallbacks) and it's used on Window
@@ skipping 2553 matching lines @@
         if ($parameter->type eq "SerializedScriptValue") {
             return 1;
         } elsif (IsIntegerType($parameter->type)) {
             return 1;
         }
     }
     return 0;
 }
 
 1;