Get rid of special casing for SVGNumber in the bindings generator

Source/bindings/scripts/deprecated_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 192 matching lines @@
                                "onmouseenter" => 1, "onmouseleave" => 1,
                                "onmousemove" => 1, "onmouseout" => 1, "onmouseover" => 1,
                                "onmouseup" => 1, "onresize" => 1, "onscroll" => 1,
                                "onunload" => 1);
 
 my %svgTypeNeedingTearOff = (
     "SVGAngle" => "SVGPropertyTearOff<SVGAngle>",
     "SVGLength" => "SVGPropertyTearOff<SVGLength>",
     "SVGLengthList" => "SVGListPropertyTearOff<SVGLengthList>",
     "SVGMatrix" => "SVGPropertyTearOff<SVGMatrix>",
-    "SVGNumber" => "SVGPropertyTearOff<float>",
+    "SVGNumber" => "SVGPropertyTearOff<SVGNumber>",
     "SVGNumberList" => "SVGListPropertyTearOff<SVGNumberList>",
     "SVGPathSegList" => "SVGPathSegListPropertyTearOff",
     "SVGPoint" => "SVGPropertyTearOff<SVGPoint>",
     "SVGPointList" => "SVGListPropertyTearOff<SVGPointList>",
     "SVGPreserveAspectRatio" => "SVGPropertyTearOff<SVGPreserveAspectRatio>",
     "SVGRect" => "SVGPropertyTearOff<FloatRect>",
     "SVGStringList" => "SVGStaticListPropertyTearOff<SVGStringList>",
     "SVGTransform" => "SVGPropertyTearOff<SVGTransform>",
     "SVGTransformList" => "SVGTransformListPropertyTearOff"
 );
@@ skipping 187 matching lines @@
 }
 
 sub SkipIncludeHeader
 {
     my $type = shift;
 
     return 1 if IsPrimitiveType($type);
     return 1 if IsEnumType($type);
     return 1 if IsCallbackFunctionType($type);
     return 1 if $type eq "DOMString";
-
-    # Special case: SVGNumber.h does not exist.
-    return 1 if $type eq "SVGNumber";
     return 0;
 }
 
 sub AddIncludesForType
 {
     my $type = shift;
 
     return if SkipIncludeHeader($type);
 
     # Default includes
@@ skipping 77 matching lines @@
 
     $svgNativeType = GetSVGTypeNeedingTearOff($implType);
     return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
 
     # Append space to avoid compilation errors when using  PassRefPtr<$svgNativeType>
     $svgNativeType = "$svgNativeType ";
 
     my $svgWrappedNativeType = GetSVGWrappedTypeNeedingTearOff($implType);
     if ($svgNativeType =~ /SVGPropertyTearOff/) {
         $svgPropertyType = $svgWrappedNativeType;
-        AddToImplIncludes("core/svg/properties/SVGAnimatedPropertyTearOff.h");
+        AddToHeaderIncludes("core/svg/properties/SVGAnimatedPropertyTearOff.h");
     } elsif ($svgNativeType =~ /SVGListPropertyTearOff/ or $svgNativeType =~ /SVGStaticListPropertyTearOff/ or $svgNativeType =~ /SVGTransformListPropertyTearOff/) {
         $svgListPropertyType = $svgWrappedNativeType;
         AddToHeaderIncludes("core/svg/properties/SVGAnimatedListPropertyTearOff.h");
     } elsif ($svgNativeType =~ /SVGPathSegListPropertyTearOff/) {
         $svgListPropertyType = $svgWrappedNativeType;
         AddToHeaderIncludes("core/svg/properties/SVGPathSegListPropertyTearOff.h");
     }
 
     return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
 }
@@ skipping 816 matching lines @@
     my $v8ClassName = GetV8ClassName($interface);
     my $attrExt = $attribute->extendedAttributes;
     my $attrName = $attribute->name;
     my $attrType = $attribute->type;
 
     if (HasCustomGetter($attrExt)) {
         return;
     }
 
     AssertNotSequenceType($attrType);
-    my $getterStringUsesImp = $interfaceName ne "SVGNumber";
     my $nativeType = GetNativeType($attribute->type, $attribute->extendedAttributes, "");
     my $svgNativeType = GetSVGTypeNeedingTearOff($interfaceName);
 
     my $conditionalString = GenerateConditionalString($attribute);
     my $code = "";
     $code .= "#if ${conditionalString}\n\n" if $conditionalString;
     $code .= <<END;
 static void ${attrName}AttrGetter${forMainWorldSuffix}(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
 END
     if ($svgNativeType) {
         my $svgWrappedNativeType = GetSVGWrappedTypeNeedingTearOff($interfaceName);
         if ($svgWrappedNativeType =~ /List/) {
             $code .= <<END;
     $svgNativeType* imp = ${v8ClassName}::toNative(info.Holder());
 END
         } else {
             $code .= <<END;
     $svgNativeType* wrapper = ${v8ClassName}::toNative(info.Holder());
     $svgWrappedNativeType& impInstance = wrapper->propertyReference();
-END
-            if ($getterStringUsesImp) {
-                $code .= <<END;
     $svgWrappedNativeType* imp = &impInstance;
 END
-            }
         }
     } elsif ($attrExt->{"OnProto"} || $attrExt->{"Unforgeable"}) {
         if ($interfaceName eq "Window") {
             $code .= <<END;
     v8::Handle<v8::Object> holder = info.Holder();
 END
         } else {
             # perform lookup first
             $code .= <<END;
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(${v8ClassName}::GetTemplate(info.GetIsolate(), worldType(info.GetIsolate())));
     if (holder.IsEmpty())
         return;
 END
         }
         $code .= <<END;
     ${implClassName}* imp = ${v8ClassName}::toNative(holder);
 END
     } else {
         my $reflect = $attribute->extendedAttributes->{"Reflect"};
         my $url = $attribute->extendedAttributes->{"URL"};
-        if ($getterStringUsesImp && $reflect && !$url && InheritsInterface($interface, "Node") && $attrType eq "DOMString") {
+        if ($reflect && !$url && InheritsInterface($interface, "Node") && $attrType eq "DOMString") {
             # Generate super-compact call for regular attribute getter:
             my ($functionName, @arguments) = GetterExpression($interfaceName, $attribute);
             $code .= "    Element* imp = V8Element::toNative(info.Holder());\n";
             $code .= "    v8SetReturnValue(info, v8String(imp->${functionName}(" . join(", ", @arguments) . "), info.GetIsolate(), ReturnUnsafeHandle));\n";
             $code .= "    return;\n";
             $code .= "}\n\n";
             $code .= "#endif // ${conditionalString}\n\n" if $conditionalString;
             $implementation{nameSpaceInternal}->add($code);
             return;
             # Skip the rest of the function!
@@ skipping 31 matching lines @@
         $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
     if ($isNullable) {
         $code .= "    bool isNull = false;\n";
     }
 
     my $returnType = $attribute->type;
     my $getterString;
 
-    if ($getterStringUsesImp) {
-        my ($functionName, @arguments) = GetterExpression($interfaceName, $attribute);
-        push(@arguments, "isNull") if $isNullable;
-        push(@arguments, "es") if $useExceptions;
-        if ($attribute->extendedAttributes->{"ImplementedBy"}) {
-            my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
-            my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
-            AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
-            unshift(@arguments, "imp") if !$attribute->isStatic;
-            $functionName = "${implementedByImplName}::${functionName}";
-        } elsif ($attribute->isStatic) {
-            $functionName = "${implClassName}::${functionName}";
-        } else {
-            $functionName = "imp->${functionName}";
-        }
-        my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"CallWith"}, "    ", 0);
-        $code .= $subCode;
-        unshift(@arguments, @$arg);
-        $getterString = "${functionName}(" . join(", ", @arguments) . ")";
+    my ($functionName, @arguments) = GetterExpression($interfaceName, $attribute);
+    push(@arguments, "isNull") if $isNullable;
+    push(@arguments, "es") if $useExceptions;
+    if ($attribute->extendedAttributes->{"ImplementedBy"}) {
+        my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
+        my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
+        AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
+        unshift(@arguments, "imp") if !$attribute->isStatic;
+        $functionName = "${implementedByImplName}::${functionName}";
+    } elsif ($attribute->isStatic) {
+        $functionName = "${implClassName}::${functionName}";
     } else {
-        $getterString = "impInstance";
+        $functionName = "imp->${functionName}";
     }
+    my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"CallWith"}, "    ", 0);
+    $code .= $subCode;
+    unshift(@arguments, @$arg);
+    $getterString = "${functionName}(" . join(", ", @arguments) . ")";
 
     my $expression;
     if ($attribute->type eq "EventListener" && $interface->name eq "Window") {
         $code .= "    if (!imp->document())\n";
         $code .= "        return;\n";
     }
 
     if ($useExceptions || $isNullable) {
         if ($nativeType =~ /^V8StringResource/) {
             $code .= "    " . ConvertToV8StringResource($attribute, $nativeType, "v", $getterString) . ";\n";
@@ skipping 387 matching lines @@
 
     $code .= GenerateCustomElementInvocationScopeIfNeeded($attribute->extendedAttributes);
 
     my $useExceptions = 1 if $attribute->extendedAttributes->{"SetterRaisesException"} ||  $attribute->extendedAttributes->{"RaisesException"};
 
     if ($useExceptions) {
         AddToImplIncludes("bindings/v8/ExceptionState.h");
         $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
-    if ($interfaceName eq "SVGNumber") {
-        $code .= "    *imp = $expression;\n";
+    if ($attribute->type eq "EventListener") {
+        my $implSetterFunctionName = FirstLetterToUpperCase($attrName);
+        AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
+        if (!InheritsInterface($interface, "Node")) {
+            my $attrImplName = GetImplName($attribute);
+            $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), value, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
+        }
+        AddToImplIncludes("bindings/v8/V8EventListenerList.h");
+        if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
+            AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
+            $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(value, true), isolatedWorldForIsolate(info.GetIsolate()));\n";
+        } else {
+            $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(value, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
+        }
     } else {
-        if ($attribute->type eq "EventListener") {
-            my $implSetterFunctionName = FirstLetterToUpperCase($attrName);
-            AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
-            if (!InheritsInterface($interface, "Node")) {
-                my $attrImplName = GetImplName($attribute);
-                $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), value, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
-            }
-            AddToImplIncludes("bindings/v8/V8EventListenerList.h");
-            if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
-                AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
-                $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(value, true), isolatedWorldForIsolate(info.GetIsolate()));\n";
-            } else {
-                $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(value, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
-            }
+        my ($functionName, @arguments) = SetterExpression($interfaceName, $attribute);
+        push(@arguments, $expression);
+        push(@arguments, "es") if $useExceptions;
+        if ($attribute->extendedAttributes->{"ImplementedBy"}) {
+            my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
+            my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
+            AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
+            unshift(@arguments, "imp") if !$attribute->isStatic;
+            $functionName = "${implementedByImplName}::${functionName}";
+        } elsif ($attribute->isStatic) {
+            $functionName = "${implClassName}::${functionName}";
         } else {
-            my ($functionName, @arguments) = SetterExpression($interfaceName, $attribute);
-            push(@arguments, $expression);
-            push(@arguments, "es") if $useExceptions;
-            if ($attribute->extendedAttributes->{"ImplementedBy"}) {
-                my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
-                my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
-                AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
-                unshift(@arguments, "imp") if !$attribute->isStatic;
-                $functionName = "${implementedByImplName}::${functionName}";
-            } elsif ($attribute->isStatic) {
-                $functionName = "${implClassName}::${functionName}";
-            } else {
-                $functionName = "imp->${functionName}";
-            }
-            my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"SetterCallWith"} || $attribute->extendedAttributes->{"CallWith"}, "    ", 1);
-            $code .= $subCode;
-            unshift(@arguments, @$arg);
-            $code .= "    ${functionName}(" . join(", ", @arguments) . ");\n";
+            $functionName = "imp->${functionName}";
         }
+        my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"SetterCallWith"} || $attribute->extendedAttributes->{"CallWith"}, "    ", 1);
+        $code .= $subCode;
+        unshift(@arguments, @$arg);
+        $code .= "    ${functionName}(" . join(", ", @arguments) . ");\n";
     }
 
     if ($useExceptions) {
         $code .= "    es.throwIfNeeded();\n";
     }
 
     if (ExtendedAttributeContains($attribute->extendedAttributes->{"CallWith"}, "ScriptState")) {
         $code .= "    if (state.hadException())\n";
         $code .= "        throwError(state.exception(), info.GetIsolate());\n";
     }
@@ skipping 4095 matching lines @@
         if ($currentInterface->extendedAttributes->{$extendedAttribute}) {
             $found = 1;
         }
         return 1 if $found;
     }, 0);
 
     return $found;
 }
 
 1;