[Binding] Support primitive type for union member

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 545 matching lines @@
 {
     my $interface = shift;
     return GetSpecialAccessorFunctionForType($interface, "getter", "DOMString");
 }
 
 sub GetSpecialAccessorFunctionForType
 {
     my $interface = shift;
     my $special = shift;
     my $type = shift;
 

[kojih, 2013/05/23 05:14:26]

quit searching all parents for special method

-    my @interfaces = ($interface);
-    ForAllParents($interface, sub {
-        my $currentInterface = shift;
-        push(@interfaces, $currentInterface);
-    });
-
-    foreach my $currentInterface (@interfaces) {
-        foreach my $function (@{$currentInterface->functions}) {
-            my $specials = $function->signature->specials;
-            my $specialExists = grep { $_ eq $special } @$specials;
-            my $parameters = $function->parameters;
-            if ($specialExists and scalar(@$parameters) == 1 and $parameters->[0]->type eq $type) {
-                return $function;
-            }
+    foreach my $function (@{$interface->functions}) {
+        my $specials = $function->signature->specials;
+        my $specialExists = grep { $_ eq $special } @$specials;
+        my $parameters = $function->parameters;
+        if ($specialExists and scalar(@$parameters) == 1 and $parameters->[0]->type eq $type) {
+            return $function;
         }
     }
 
     return 0;
 }
 
 sub GenerateHeader
 {
     my $object = shift;
     my $interface = shift;
@@ skipping 2441 matching lines @@
         for my $i (0 .. scalar(@$types)-1) {
             my $unionMemberType = $types->[$i];
             my $unionMemberVariable = $variableName . $i;
             my $isNull = GenerateIsNullExpression($unionMemberType, $unionMemberVariable);
             push @expression, $isNull;
         }
         return join " && ", @expression;
     }
     if (IsRefPtrType($type)) {
         return "!${variableName}";
+    } elsif ($type eq "DOMString") {
+        return "${variableName}.isNull()";
     } else {
-        return "${variableName}.isNull()";
+        return "";

[kojih, 2013/05/23 05:14:26]

primitive case

     }
 }
 
 sub GenerateImplementationIndexedProperty
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
@@ skipping 145 matching lines @@
         push @arguments, "ec";
     }
 
     if (IsUnionType($returnType)) {
         my $code = "";
         my @extraArguments = ();
         for my $i (0..scalar(@{$returnType->unionMemberTypes})-1) {
             my $unionMemberType = $returnType->unionMemberTypes->[$i];
             my $nativeType = GetNativeType($unionMemberType);
             my $unionMemberVariable = $returnName . $i;
+            my $unionMemberEnabledVariable = $returnName . $i . "Enabled";
+            $code .= "    bool ${unionMemberEnabledVariable} = false;\n";
             $code .= "    ${nativeType} ${unionMemberVariable};\n";
+            push @extraArguments, $unionMemberEnabledVariable;
             push @extraArguments, $unionMemberVariable;
         }
         push @arguments, @extraArguments;
         $code .= "    ${functionExpression}(" . (join ", ", @arguments) . ");";
         return $code;
     } else {
         my $nativeType = GetNativeType($returnType);
         return "    ${nativeType} element = ${functionExpression}(" . (join ", ", @arguments) . ");"
     }
 }
@@ skipping 10 matching lines @@
     my $returnType = $namedGetterFunction->signature->type;
     my $isNull = GenerateIsNullExpression($returnType, "element");
     my $nativeValue = "element";
     $nativeValue .= ".release()" if (IsRefPtrType($returnType));
     my $returnJSValueCode = NativeToJSValue($namedGetterFunction->signature->type, $namedGetterFunction->signature->extendedAttributes, $nativeValue, "    ", "return", "info.Holder()", "info.GetIsolate()", "info", "collection");
     my $raisesExceptions = $namedGetterFunction->signature->extendedAttributes->{"RaisesException"};
     my $methodCallCode = GenerateMethodCall($returnType, "element", "collection->${methodName}", "propertyName", $raisesExceptions);
 
     my $code = "v8::Handle<v8::Value> ${v8ClassName}::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)\n";
     $code .= "{\n";
-    if (!$namedGetterFunction->signature->extendedAttributes->{"DoNotCheckJSProperty"}) {
+    if (!$namedGetterFunction->signature->extendedAttributes->{"OverrideBuiltins"}) {
         $code .= "    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())\n";
         $code .= "        return v8Undefined();\n";
         $code .= "    if (info.Holder()->HasRealNamedCallbackProperty(name))\n";
         $code .= "        return v8Undefined();\n";
     }
     $code .= "\n";
     $code .= "    ASSERT(V8DOMWrapper::maybeDOMWrapper(info.Holder()));\n";
     $code .= "    ${implClassName}* collection = toNative(info.Holder());\n";
     $code .= "    AtomicString propertyName = toWebCoreAtomicString(name);\n";
     if ($raisesExceptions) {
@@ skipping 1481 matching lines @@
     my $returnHandleTypeArg = $returnHandleType ? ", $returnHandleType" : "";
     my $forMainWorldSuffix = shift || "";
 
     if (IsUnionType($type)) {
         my $types = $type->unionMemberTypes;
         my @codes = ();
         for my $i (0 .. scalar(@$types)-1) {
             my $unionMemberType = $types->[$i];
             my $unionMemberNumber = $i + 1;
             my $unionMemberVariable = $nativeValue . $i;
+            my $unionMemberEnabledVariable = $nativeValue . $i . "Enabled";
             my $unionMemberNativeValue = $unionMemberVariable;
             $unionMemberNativeValue .= ".release()" if (IsRefPtrType($unionMemberType));
             my $returnJSValueCode = NativeToJSValue($unionMemberType, $extendedAttributes, $unionMemberNativeValue, $indent . "    ", $receiver, $getCreationContext, $getIsolate, $getHolderContainer, $getScriptWrappable, $returnHandleType, $forMainWorldSuffix);
-            my $isNotNull = "!" . GenerateIsNullExpression($unionMemberType, $unionMemberVariable);
+            my $isNotNull = GenerateIsNullExpression($unionMemberType, $unionMemberVariable);
+            $isNotNull = " && !" . $isNotNull if $isNotNull;
             my $code = "";
-            $code .= "${indent}if (${isNotNull})\n";
+            $code .= "${indent}if (${unionMemberEnabledVariable}${isNotNull})\n";
             $code .= "${returnJSValueCode}";
             push @codes, $code;
         }
         return join "\n", @codes;
     }
 
     return "$indent$receiver v8Boolean($nativeValue, $getIsolate);" if $type eq "boolean";
     return "$indent$receiver v8Undefined();" if $type eq "void";     # equivalent to v8Undefined()
 
     # HTML5 says that unsigned reflected attributes should be in the range
@@ skipping 641 matching lines @@
         if ($currentInterface->extendedAttributes->{$extendedAttribute}) {
             $found = 1;
         }
         return 1 if $found;
     }, 0);
 
     return $found;
 }
 
 1;