Changeset 70410 in webkit

Timestamp:

Oct 24, 2010 3:38:56 AM (14 years ago)

Author:

Nikolas Zimmermann

Message:

2010-10-23 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
​https://bugs.webkit.org/show_bug.cgi?id=48179

Rewrite SVGAngle to use the new SVGPropertyTearOff concept, and consume much less memory.
Down from two floats, one string and an ushort to one float and one ushort. Synchronize value/valueInSpecifiedUnits/valueAsString on demand.

Adding an extensive SVGAngle test, that required to implement 'StrictTypeChecking' for attribute setters (was only implemented in V8/JSC for function cals so far).

Test: svg/dom/SVGAngle.html

• GNUmakefile.am: Add SVGAnimatedAngle.h to build.
• WebCore.gypi: Ditto.
• WebCore.pro: Ditto.
• WebCore.vcproj/WebCore.vcproj: Ditto.
• WebCore.xcodeproj/project.pbxproj: Ditto.
• bindings/scripts/CodeGenerator.pm: Split IsPrimitiveType in IsPrimitiveType and IsNumericType.
• bindings/scripts/CodeGeneratorJS.pm: Implement 'StrictTypeChecking' for setters and recognize SVGAngle as new SVGPropertyTearOff type.
• bindings/scripts/CodeGeneratorObjC.pm: Ditto.
• bindings/scripts/CodeGeneratorV8.pm: Ditto.
• svg/DeprecatedSVGAnimatedPropertyTraits.h: Remove SVGAngle handling.
• svg/DeprecatedSVGAnimatedTemplate.h: Remove SVGAnimatedAngle handling.
• svg/SVGAngle.cpp: Rewrite, to consume less memory and to operate more efficient.
• svg/SVGAngle.h: Ditto.
• svg/SVGAngle.idl: Add 'StrictTypeChecking' to the value/valueInSpecifiedUnits methods.
• svg/SVGAnimatedAngle.h: Added.
• svg/SVGAnimatedAngle.idl: Mark as [SVGAnimatedProperty].
• svg/SVGMarkerElement.cpp: (WebCore::SVGMarkerElement::parseMappedAttribute): SVGAngle::setValueAsString() now takes an ExceptionCode parameter.
• svg/SVGMarkerElement.h: s/ANIMATED_PROPERTY/ANIMATED_PROPERTY_NEW/ for the SVGAngle type.
• svg/SVGNumber.idl: Remove exception setter exceptions, which aren't needed. As we're now generating exception handlers in the bindings, it would lead to compile errors.
• svg/SVGPoint.idl: Ditto.
• svg/SVGRect.idl: Ditto.
• svg/SVGSVGElement.idl: Remove obsolete [SVGLiveProperty] flag.

2010-10-23 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
​https://bugs.webkit.org/show_bug.cgi?id=48179

Add an extensive SVGAngle test, checking all getter/setters & methods, with valid and invalid arguments.
The test exposes bugs in Opera & FireFox, we now pass them all.

• svg/dom/SVGAngle-expected.txt: Added.
• svg/dom/SVGAngle.html: Added.
• svg/dom/script-tests/SVGAngle.js: Added.
• svg/dom/svg-element-attribute-js-null-expected.txt:
• svg/dom/svg-element-attribute-js-null.xhtml: Update incorrect test, setting valueAsString to null, should not result in "0deg" but "0".

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGAngle-expected.txt (added)
• LayoutTests/svg/dom/SVGAngle.html (added)
• LayoutTests/svg/dom/script-tests/SVGAngle.js (added)
• LayoutTests/svg/dom/svg-element-attribute-js-null-expected.txt (modified) (1 diff)
• LayoutTests/svg/dom/svg-element-attribute-js-null.xhtml (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/bindings/scripts/CodeGenerator.pm (modified) (6 diffs)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (13 diffs)
• WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (4 diffs)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (14 diffs)
• WebCore/svg/DeprecatedSVGAnimatedPropertyTraits.h (modified) (2 diffs)
• WebCore/svg/DeprecatedSVGAnimatedTemplate.h (modified) (2 diffs)
• WebCore/svg/SVGAngle.cpp (modified) (3 diffs)
• WebCore/svg/SVGAngle.h (modified) (2 diffs)
• WebCore/svg/SVGAngle.idl (modified) (1 diff)
• WebCore/svg/SVGAnimatedAngle.h (added)
• WebCore/svg/SVGAnimatedAngle.idl (modified) (1 diff)
• WebCore/svg/SVGMarkerElement.cpp (modified) (1 diff)
• WebCore/svg/SVGMarkerElement.h (modified) (1 diff)
• WebCore/svg/SVGNumber.idl (modified) (1 diff)
• WebCore/svg/SVGPoint.idl (modified) (1 diff)
• WebCore/svg/SVGRect.idl (modified) (1 diff)
• WebCore/svg/SVGSVGElement.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-23  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
+        https://bugs.webkit.org/show_bug.cgi?id=48179
+
+        Add an extensive SVGAngle test, checking all getter/setters & methods, with valid and invalid arguments.
+        The test exposes bugs in Opera & FireFox, we now pass them all.
+
+        * svg/dom/SVGAngle-expected.txt: Added.
+        * svg/dom/SVGAngle.html: Added.
+        * svg/dom/script-tests/SVGAngle.js: Added.
+        * svg/dom/svg-element-attribute-js-null-expected.txt:
+        * svg/dom/svg-element-attribute-js-null.xhtml: Update incorrect test, setting valueAsString to null, should not result in "0deg" but "0".
+
 2010-10-23  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/svg/dom/svg-element-attribute-js-null-expected.txt

@@ -4 +4 @@
 TEST SUCCEEDED: The value was the empty string. [tested SVGElement.xmlbase]
 
-TEST SUCCEEDED: The value was the string '0deg'. [tested SVGAngle.valueAsString]
+TEST SUCCEEDED: The value was the string '0'. [tested SVGAngle.valueAsString]
 
 TEST SUCCEEDED: The value was the string '0'. [tested SVGLength.valueAsString]

trunk/LayoutTests/svg/dom/svg-element-attribute-js-null.xhtml

@@ -61 +61 @@
                     elementToUse: svg.createSVGAngle(),
                     attributes: [
-                        {name: 'valueAsString', expectedNull: '0deg'}
+                        {name: 'valueAsString', expectedNull: '0'}
                     ]
                 },

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-23  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
+        https://bugs.webkit.org/show_bug.cgi?id=48179
+
+        Rewrite SVGAngle to use the new SVGPropertyTearOff concept, and consume much less memory.
+        Down from two floats, one string and an ushort to one float and one ushort. Synchronize value/valueInSpecifiedUnits/valueAsString on demand.
+
+        Adding an extensive SVGAngle test, that required to implement 'StrictTypeChecking' for attribute setters (was only implemented in V8/JSC for function cals so far).
+
+        Test: svg/dom/SVGAngle.html
+
+        * GNUmakefile.am: Add SVGAnimatedAngle.h to build.
+        * WebCore.gypi: Ditto.
+        * WebCore.pro: Ditto.
+        * WebCore.vcproj/WebCore.vcproj: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+        * bindings/scripts/CodeGenerator.pm: Split IsPrimitiveType in IsPrimitiveType and IsNumericType.
+        * bindings/scripts/CodeGeneratorJS.pm: Implement 'StrictTypeChecking' for setters and recognize SVGAngle as new SVGPropertyTearOff type.
+        * bindings/scripts/CodeGeneratorObjC.pm: Ditto.
+        * bindings/scripts/CodeGeneratorV8.pm: Ditto.
+        * svg/DeprecatedSVGAnimatedPropertyTraits.h: Remove SVGAngle handling.
+        * svg/DeprecatedSVGAnimatedTemplate.h: Remove SVGAnimatedAngle handling.
+        * svg/SVGAngle.cpp: Rewrite, to consume less memory and to operate more efficient.
+        * svg/SVGAngle.h: Ditto.
+        * svg/SVGAngle.idl: Add 'StrictTypeChecking' to the value/valueInSpecifiedUnits methods.
+        * svg/SVGAnimatedAngle.h: Added.
+        * svg/SVGAnimatedAngle.idl: Mark as [SVGAnimatedProperty].
+        * svg/SVGMarkerElement.cpp:
+        (WebCore::SVGMarkerElement::parseMappedAttribute): SVGAngle::setValueAsString() now takes an ExceptionCode parameter.
+        * svg/SVGMarkerElement.h: s/ANIMATED_PROPERTY/ANIMATED_PROPERTY_NEW/ for the SVGAngle type.
+        * svg/SVGNumber.idl: Remove exception setter exceptions, which aren't needed. As we're now generating exception handlers in the bindings, it would lead to compile errors.
+        * svg/SVGPoint.idl: Ditto.
+        * svg/SVGRect.idl: Ditto.
+        * svg/SVGSVGElement.idl: Remove obsolete [SVGLiveProperty] flag.
+
 2010-10-23  Daniel Bates  <dbates@rim.com>
 

trunk/WebCore/GNUmakefile.am

@@ -3029 +3029 @@
         WebCore/svg/SVGAnimateColorElement.cpp \
         WebCore/svg/SVGAnimateColorElement.h \
+        WebCore/svg/SVGAnimatedAngle.h \
         WebCore/svg/SVGAnimatedLength.h \
         WebCore/svg/SVGAnimatedLengthList.h \

trunk/WebCore/WebCore.gypi

@@ -3959 +3959 @@
             'svg/SVGAnimateTransformElement.cpp',
             'svg/SVGAnimateTransformElement.h',
+            'svg/SVGAnimatedAngle.h',
             'svg/SVGAnimatedLength.h',
             'svg/SVGAnimatedLengthList.h',

trunk/WebCore/WebCore.pro

@@ -2359 +2359 @@
     svg/SVGAngle.h \
     svg/SVGAnimateColorElement.h \
+    svg/SVGAnimatedAngle.h \
     svg/SVGAnimatedLength.h \
     svg/SVGAnimatedLengthList.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -61172 +61172 @@
                         </File>
                         <File
+                                RelativePath="..\svg\SVGAnimatedAngle.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\svg\SVGAnimatedLength.h"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -157 +157 @@
                 08744BAA0EDB7D86004C9E63 /* WMLOnEventElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08744BA90EDB7D86004C9E63 /* WMLOnEventElement.cpp */; };
                 08744BAE0EDB7D92004C9E63 /* WMLOnEventElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08744BAD0EDB7D92004C9E63 /* WMLOnEventElement.h */; };
+                087B84961272CEC800A14417 /* SVGAnimatedAngle.h in Headers */ = {isa = PBXBuildFile; fileRef = 087B84951272CEC700A14417 /* SVGAnimatedAngle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 087D97BF10FB8D7700C00874 /* JSSVGPODListCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 087D97BE10FB8D7700C00874 /* JSSVGPODListCustom.h */; };
                 087FFA0F0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087FFA0D0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp */; };
@@ -6156 +6157 @@
                 08744BA90EDB7D86004C9E63 /* WMLOnEventElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLOnEventElement.cpp; sourceTree = "<group>"; };
                 08744BAD0EDB7D92004C9E63 /* WMLOnEventElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLOnEventElement.h; sourceTree = "<group>"; };
+                087B84951272CEC700A14417 /* SVGAnimatedAngle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedAngle.h; sourceTree = "<group>"; };
                 087D97BE10FB8D7700C00874 /* JSSVGPODListCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGPODListCustom.h; sourceTree = "<group>"; };
                 087FFA0D0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLInsertedLegendElement.cpp; sourceTree = "<group>"; };
@@ -15942 +15944 @@
                                 B22277E40D00BF1F0071B782 /* SVGAnimateColorElement.h */,
                                 B22277E50D00BF1F0071B782 /* SVGAnimateColorElement.idl */,
+                                087B84951272CEC700A14417 /* SVGAnimatedAngle.h */,
                                 B22277E60D00BF1F0071B782 /* SVGAnimatedAngle.idl */,
                                 B22277E70D00BF1F0071B782 /* SVGAnimatedBoolean.idl */,
@@ -21152 +21155 @@
                                 089021AD126EF5E90092D5EA /* SVGAnimatedLengthList.h in Headers */,
                                 8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */,
+                                087B84961272CEC800A14417 /* SVGAnimatedAngle.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/bindings/scripts/CodeGenerator.pm

@@ -6 +6 @@
 # Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
+# Copyright (C) Research In Motion Limited 2010. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
@@ -43 +44 @@
 my $verbose = 0;
 
-my %primitiveTypeHash = ("int" => 1, "short" => 1, "long" => 1, "long long" => 1,
-                         "unsigned int" => 1, "unsigned short" => 1,
-                         "unsigned long" => 1, "unsigned long long" => 1,
-                         "float" => 1, "double" => 1,
-                         "boolean" => 1, "void" => 1,
-                         "Date" => 1);
+my %numericTypeHash = ("int" => 1, "short" => 1, "long" => 1, "long long" => 1,
+                       "unsigned int" => 1, "unsigned short" => 1,
+                       "unsigned long" => 1, "unsigned long long" => 1,
+                       "float" => 1, "double" => 1);
+
+my %primitiveTypeHash = ( "boolean" => 1, "void" => 1, "Date" => 1);
 
 my %podTypeHash = ("SVGNumber" => 1, "SVGTransform" => 1);
-my %podTypesWithWritablePropertiesHash = ("SVGAngle" => 1, "SVGMatrix" => 1, "SVGPoint" => 1, "SVGPreserveAspectRatio" => 1, "SVGRect" => 1);
+my %podTypesWithWritablePropertiesHash = ("SVGMatrix" => 1, "SVGPoint" => 1, "SVGPreserveAspectRatio" => 1, "SVGRect" => 1);
 my %stringTypeHash = ("DOMString" => 1, "AtomicString" => 1);
 
 my %nonPointerTypeHash = ("DOMTimeStamp" => 1, "CompareHow" => 1, "SVGPaintType" => 1);
 
-my %svgNewStyleAnimatedTypeHash = ("SVGAnimatedLength" => 1, "SVGAnimatedLengthList" => 1);
+my %svgTypeNeedingTearOffHash = ("SVGLength" => 1, "SVGAngle" => 1);
+
+my %svgNewStyleAnimatedTypeHash = ("SVGAnimatedAngle" => 1, "SVGAnimatedLength" => 1, "SVGAnimatedLengthList" => 1);
 
 my %svgAnimatedTypeHash = ("SVGAnimatedAngle" => 1, "SVGAnimatedBoolean" => 1,
@@ -284 +287 @@
 
 # Helpers for all CodeGenerator***.pm modules
+
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub IsPodType
 {
@@ -303 +308 @@
 }
 
+sub IsNumericType
+{
+    my $object = shift;
+    my $type = shift;
+
+    return 1 if $numericTypeHash{$type};
+    return 0;
+}
+
 sub IsPrimitiveType
 {
@@ -309 +323 @@
 
     return 1 if $primitiveTypeHash{$type};
+    return 1 if $numericTypeHash{$type};
     return 0;
 }
@@ -326 +341 @@
     my $type = shift;
 
-    return 1 if $nonPointerTypeHash{$type} or $primitiveTypeHash{$type};
+    return 1 if $nonPointerTypeHash{$type} or $primitiveTypeHash{$type} or $numericTypeHash{$type};
+    return 0;
+}
+
+
+sub IsSVGTypeNeedingTearOff
+{
+    my $object = shift;
+    my $type = shift;
+
+    return 1 if $svgTypeNeedingTearOffHash{$type};
     return 0;
 }

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -325 +325 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub IsSVGTypeNeedingContextParameter
 {
+    # FIXME: This function will be removed, as soon the PODType concept is gone, and all SVG datatypes use the new style JS bindings.
+
     my $implClassName = shift;
 
@@ -333 +336 @@
     return 0 if $codeGenerator->IsSVGNewStyleAnimatedType($implClassName);
 
-    my @noContextNeeded = ("SVGLength", "SVGLengthList", "SVGPaint", "SVGColor", "SVGDocument", "SVGZoomEvent");
+    my @noContextNeeded = ("SVGAngle", "SVGLength", "SVGLengthList", "SVGPaint", "SVGColor", "SVGDocument", "SVGZoomEvent");
     foreach (@noContextNeeded) {
         return 0 if $implClassName eq $_;
@@ -1803 +1806 @@
                             push(@implContent, "    $className* castedThis = static_cast<$className*>(thisObject);\n");
                             push(@implContent, "    $implType* imp = static_cast<$implType*>(castedThis->impl());\n");
+                            push(@implContent, "    ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
+
+                            # For setters with "StrictTypeChecking", if an input parameter's type does not match the signature,
+                            # a TypeError is thrown instead of casting to null.
+                            if ($attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
+                                my $argType = $attribute->signature->type;
+                                if ($codeGenerator->IsStringType($argType)) {
+                                    push(@implContent, "    if (!value.isUndefinedOrNull() && !value.isString() && !value.isObject()) {\n");
+                                    push(@implContent, "        throwVMTypeError(exec);\n");
+                                    push(@implContent, "        return;\n");
+                                    push(@implContent, "    };\n");
+                                } elsif ($codeGenerator->IsNumericType($argType)) {
+                                    push(@implContent, "    if (!value.isUndefinedOrNull() && !value.isNumber()) {\n");
+                                    push(@implContent, "        throwVMTypeError(exec);\n");
+                                    push(@implContent, "        return;\n");
+                                    push(@implContent, "    };\n");
+                                } elsif (!IsNativeType($argType)) {
+                                    push(@implContent, "    if (!value.isUndefinedOrNull() && !value.inherits(&JS${argType}::s_info)) {\n");
+                                    push(@implContent, "        throwVMTypeError(exec);\n");
+                                    push(@implContent, "        return;\n");
+                                    push(@implContent, "    };\n");
+                                }
+                            }
+
+                            my $nativeValue = JSValueToNative($attribute->signature, "value");
                             if ($svgPropertyOrPodType) {
                                 push(@implContent, "    $svgPropertyOrPodType podImp(*imp);\n") if $podType;
                                 push(@implContent, "    $svgPropertyOrPodType& podImp = imp->propertyReference();\n") if !$podType;
                                 if ($svgPropertyOrPodType eq "float") { # Special case for JSSVGNumber
-                                    push(@implContent, "    podImp = " . JSValueToNative($attribute->signature, "value") . ";\n");
+                                    push(@implContent, "    podImp = $nativeValue;\n");
                                 } else {
-                                    push(@implContent, "    podImp.set$implSetterFunctionName(" . JSValueToNative($attribute->signature, "value") . ");\n");
+                                    push(@implContent, "    podImp.set$implSetterFunctionName($nativeValue");
+                                    push(@implContent, ", ec") if @{$attribute->setterExceptions};
+                                    push(@implContent, ");\n");
+                                    push(@implContent, "    setDOMException(exec, ec);\n") if @{$attribute->setterExceptions};
                                 }
                                 push(@implContent, "    imp->commitChange(podImp, castedThis);\n") if $podType;
-                                push(@implContent, "    imp->commitChange();\n") if $svgPropertyType;
+                                if ($svgPropertyType) {
+                                    if (@{$attribute->setterExceptions}) {
+                                        push(@implContent, "    if (!ec)\n"); 
+                                        push(@implContent, "        imp->commitChange();\n");
+                                    } else {
+                                        push(@implContent, "    imp->commitChange();\n");
+                                    }
+                                }
                             } else {
-                                my $nativeValue = JSValueToNative($attribute->signature, "value");
                                 my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
-
-                                push(@implContent, "    ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
                                 push(@implContent, "    imp->$setterExpressionPrefix$nativeValue");
                                 push(@implContent, ", ec") if @{$attribute->setterExceptions};
@@ -2009 +2044 @@
 
                         my $name = $parameter->name;
-
-                        if ($parameter->type eq "XPathNSResolver") {
+                        my $argType = $codeGenerator->StripModule($parameter->type);
+
+                        if ($argType eq "XPathNSResolver") {
                             push(@implContent, "    RefPtr<XPathNSResolver> customResolver;\n");
                             push(@implContent, "    XPathNSResolver* resolver = toXPathNSResolver(exec->argument($argsIndex));\n");
@@ -2020 +2056 @@
                             push(@implContent, "    }\n");
                         } elsif ($parameter->extendedAttributes->{"Callback"}) {
-                            my $callbackClassName = GetCallbackClassName($parameter->type);
+                            my $callbackClassName = GetCallbackClassName($argType);
                             $implIncludes{"$callbackClassName.h"} = 1;
                             if ($parameter->extendedAttributes->{"Optional"}) {
-                                push(@implContent, "    RefPtr<" . $parameter->type. "> $name;\n");
+                                push(@implContent, "    RefPtr<$argType> $name;\n");
                                 push(@implContent, "    if (exec->argumentCount() > $argsIndex && !exec->argument($argsIndex).isNull() && !exec->argument($argsIndex).isUndefined()) {\n");
                                 push(@implContent, "        if (!exec->argument($argsIndex).isObject()) {\n");
@@ -2036 +2072 @@
                                 push(@implContent, "        return JSValue::encode(jsUndefined());\n");
                                 push(@implContent, "    }\n");
-                                push(@implContent, "    RefPtr<" . $parameter->type . "> $name = ${callbackClassName}::create(asObject(exec->argument($argsIndex)), castedThis->globalObject());\n");
+                                push(@implContent, "    RefPtr<$argType> $name = ${callbackClassName}::create(asObject(exec->argument($argsIndex)), castedThis->globalObject());\n");
                             }
                         } else {
@@ -2043 +2079 @@
                             if ($function->signature->extendedAttributes->{"StrictTypeChecking"}) {
                                 my $argValue = "exec->argument($argsIndex)";
-                                my $argType = $codeGenerator->StripModule($parameter->type);
-                                if (!IsNativeType($argType)) {
+                                if ($codeGenerator->IsStringType($argType)) {
+                                    push(@implContent, "    if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isString() && !${argValue}.isObject())\n");
+                                    push(@implContent, "        return throwVMTypeError(exec);\n");
+                                } elsif ($codeGenerator->IsNumericType($argType)) {
+                                    push(@implContent, "    if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isNumber())\n");
+                                    push(@implContent, "        return throwVMTypeError(exec);\n");
+                                } elsif (!IsNativeType($argType)) {
                                     push(@implContent, "    if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.inherits(&JS${argType}::s_info))\n");
                                     push(@implContent, "        return throwVMTypeError(exec);\n");
-                                } elsif ($codeGenerator->IsStringType($argType)) {
-                                    push(@implContent, "    if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isString() && !${argValue}.isObject())\n");
-                                    push(@implContent, "        return throwVMTypeError(exec);\n");
-                                }
+                                } 
                             }
 
@@ -2068 +2106 @@
                             push(@implContent, "    if (exec->hadException())\n");
                             push(@implContent, "        return JSValue::encode(jsUndefined());\n");
+
+                            if ($codeGenerator->IsSVGTypeNeedingTearOff($argType) and not $implClassName =~ /List$/) {
+                                push(@implContent, "    if (!$name) {\n");
+                                push(@implContent, "        setDOMException(exec, TYPE_MISMATCH_ERR);\n");
+                                push(@implContent, "        return JSValue::encode(jsUndefined());\n");
+                                push(@implContent, "    }\n");
+                            }
                         }
 
                         $functionString .= ", " if $paramIndex;
 
-                        if ($parameter->type eq "NodeFilter") {
+                        if ($argType eq "NodeFilter") {
                             $functionString .= "$name.get()";
+                        } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($argType) and not $implClassName =~ /List$/) {
+                            $functionString .= "$name->propertyReference()";
                         } else {
                             $functionString .= $name;
@@ -2372 +2419 @@
         push(@implContent, $indent . "setDOMException(exec, ec);\n") if @{$function->raisesExceptions};
         push(@implContent, $indent . "imp->commitChange(podImp, castedThis);\n") if $podType;
-        push(@implContent, $indent . "imp->commitChange();\n") if $svgPropertyType;
+
+        if ($svgPropertyType) {
+            if (@{$function->raisesExceptions}) {
+                push(@implContent, $indent . "if (!ec)\n"); 
+                push(@implContent, $indent . "    imp->commitChange();\n");
+            } else {
+                push(@implContent, $indent . "imp->commitChange();\n");
+            }
+        }
+
         push(@implContent, $indent . "return JSValue::encode(jsUndefined());\n");
     } else {
@@ -2414 +2470 @@
     "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
     "IDBKey" => "RefPtr<IDBKey>",
-    "SVGAngle" => "SVGAngle",
+    "SVGAngle" => "SVGPropertyTearOff<SVGAngle>*",
     "SVGLength" => "SVGPropertyTearOff<SVGLength>*",
     "SVGMatrix" => "AffineTransform",
@@ -2568 +2624 @@
     } 
 
-    my $svgLivePropertyType = $signature->extendedAttributes->{"SVGLiveProperty"};
-    if ($svgLivePropertyType) {
-        $implIncludes{"JS$type.h"} = 1;
-        return "toJS(exec, $globalObject, SVGPropertyTearOff<$type>::create($value).get())";
-    }
-
     if ($type eq "CSSStyleDeclaration") {
         $implIncludes{"CSSMutableStyleDeclaration.h"} = 1;
@@ -2613 +2663 @@
     }
 
-    # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
     if ($codeGenerator->IsSVGNewStyleAnimatedType($implClassName)) {
+        # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
         if ($implClassName =~ /List$/) {
             $value = "static_cast<SVGListPropertyTearOff<$type>*>($value)";
@@ -2620 +2670 @@
             $value = "static_cast<SVGPropertyTearOff<$type>*>($value)";
         }
+    } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($type) and not $implClassName =~ /List$/) {
+        $value = "SVGPropertyTearOff<$type>::create($value)";
     }
 

trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -7 +7 @@
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) 2010 Google Inc.
+# Copyright (C) Research In Motion Limited 2010. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
@@ -1370 +1371 @@
                     $getterContentHead = "$getterExpressionPrefix";
                     push(@implContent, "    $svgPropertyTypeWithNamespace& podImpl = IMPL->propertyReference();\n");
-                    push(@implContent, "    podImpl.$coreSetterName($arg);\n");
-                    push(@implContent, "    IMPL->commitChange();\n");
+                    my $ec = $hasSetterException ? ", ec" : "";
+                    push(@implContent, "    $exceptionInit\n") if $hasSetterException;
+                    push(@implContent, "    podImpl.$coreSetterName($arg$ec);\n");
+                    if ($hasSetterException) {
+                        push(@implContent, "    if (!ec)\n");
+                        push(@implContent, "        IMPL->commitChange();\n");
+                        push(@implContent, "    $exceptionRaiseOnError\n");
+                    } else {
+                        push(@implContent, "        IMPL->commitChange();\n");
+                    }
                 } elsif ($svgListPropertyType) {
                     $getterContentHead = "$getterExpressionPrefix";
@@ -1504 +1513 @@
             push(@parameterNames, "ec") if $raisesExceptions and !($svgMatrixRotateFromVector || $svgMatrixInverse);
             push(@parameterNames, "0 /* FIXME */") if $svgLengthConvertToSpecifiedUnits; 
+
+            # Handle arguments that are 'SVGProperty' based (SVGAngle/SVGLength). We need to convert from SVGPropertyTearOff<Type>* to Type,
+            # to be able to call the desired WebCore function. If the conversion fails, we can't extract Type and need to raise an exception.
+            my $currentParameter = -1;
+            foreach my $param (@{$function->parameters}) {
+                $currentParameter++;
+
+                my $paramName = $param->name;
+                my $idlType = $codeGenerator->StripModule($param->type);
+                next if not $codeGenerator->IsSVGTypeNeedingTearOff($idlType) or $implClassName =~ /List$/;
+
+                my $implGetter = GetObjCTypeGetter($paramName, $idlType);
+                my $idlTypeWithNamespace = ($idlType eq "float") ? "$idlType" : "WebCore::$idlType";
+
+                push(@functionContent, "    WebCore::SVGPropertyTearOff<$idlTypeWithNamespace>* ${paramName}Core = $implGetter;\n");
+                push(@functionContent, "    if (!${paramName}Core) {\n");
+                push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::TYPE_MISMATCH_ERR;\n");
+                push(@functionContent, "        $exceptionRaiseOnError\n");
+                if ($returnType eq "void") { 
+                    push(@functionContent, "        return;\n");
+                } else {
+                    push(@functionContent, "        return nil;\n");
+                }
+                push(@functionContent, "    }\n");
+
+                # Replace the paramter core() getter, by the cached variable.
+                splice(@parameterNames, $currentParameter, 1, "${paramName}Core->propertyReference()");
+            }
+
             my $content = $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")"; 
 
@@ -1555 +1593 @@
             } else {
                 if (ConversionNeeded($function->signature->type)) {
-                    my $svgLiveProperty = $function->signature->extendedAttributes->{"SVGLiveProperty"};
-                    if ($svgLiveProperty) {
-                        $content = "kit(WebCore::SVGPropertyTearOff<WebCore::" . $function->signature->type . ">::create($content).get())";
+                    if ($codeGenerator->IsSVGTypeNeedingTearOff($function->signature->type) and not $implClassName =~ /List$/) {
+                        $content = "kit(WTF::getPtr(WebCore::SVGPropertyTearOff<WebCore::" . $function->signature->type . ">::create($content)))";
                     } elsif ($codeGenerator->IsPodType($function->signature->type)) {
                         $content = "kit($content)";

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -7 +7 @@
 # Copyright (C) 2007, 2008, 2009 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
+# Copyright (C) Research In Motion Limited 2010. All rights reserved.
 #
 # This library is free software; you can redistribute it and/or
@@ -88 +89 @@
 
 # Workaround for V8 bindings difference where RGBColor is not a POD type.
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub IsPodType
 {
@@ -937 +939 @@
     push(@implContentDecls, "    INC_STATS(\"DOM.$implClassName.$attrName._set\");\n");
 
+    # For functions with "StrictTypeChecking", if an input parameter's type does not match the signature,
+    # a TypeError is thrown instead of casting to null.
+    if ($attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
+        my $argType = GetTypeFromSignature($attribute->signature);
+        if ($codeGenerator->IsStringType($argType)) {
+            push(@implContentDecls, "    if (!isUndefinedOrNull(value) && !value->IsString() && !value->IsObject()) {\n");
+            push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
+            push(@implContentDecls, "        return;\n");
+            push(@implContentDecls, "    }\n");
+        } elsif ($codeGenerator->IsNumericType($argType)) {
+            push(@implContentDecls, "    if (!isUndefinedOrNull(value) && !value->IsNumber()) {\n");
+            push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
+            push(@implContentDecls, "        return;\n");
+            push(@implContentDecls, "    }\n");
+        } elsif (IsWrapperType($argType)) {
+            push(@implContentDecls, "    if (!isUndefinedOrNull(value) && !V8${argType}::HasInstance(value)) {\n");
+            push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
+            push(@implContentDecls, "        return;\n");
+            push(@implContentDecls, "    }\n");
+        }
+    }
+
     my $isPodType = IsPodType($implClassName);
     my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
@@ -1051 +1075 @@
         push(@implContentDecls, "    wrapper->commitChange(*imp, V8Proxy::svgContext(wrapper));\n");
     } elsif ($svgPropertyType) {
-        push(@implContentDecls, "    wrapper->commitChange();\n");
+        if ($useExceptions) {
+            push(@implContentDecls, "    if (!ec)\n");
+            push(@implContentDecls, "        wrapper->commitChange();\n");
+        } else {
+            push(@implContentDecls, "    wrapper->commitChange();\n");
+        }
     } elsif (IsSVGTypeNeedingContextParameter($implClassName)) {
         $implIncludes{"SVGElement.h"} = 1;
@@ -1378 +1407 @@
                 my $argValue = "args[$paramIndex]";
                 my $argType = GetTypeFromSignature($parameter);
-                if (IsWrapperType($argType)) {
-                    push(@implContentDecls, "    if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !V8${argType}::HasInstance($argValue)) {\n");
+                if ($codeGenerator->IsStringType($argType)) {
+                    push(@implContentDecls, "    if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !${argValue}->IsString() && !${argValue}->IsObject()) {\n");
                     push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
                     push(@implContentDecls, "        return notHandledByInterceptor();\n");
                     push(@implContentDecls, "    }\n");
-                } elsif ($codeGenerator->IsStringType($argType)) {
-                    push(@implContentDecls, "    if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !${argValue}->IsString() && !${argValue}->IsObject()) {\n");
+                } elsif ($codeGenerator->IsNumericType($argType)) {
+                    push(@implContentDecls, "    if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !${argValue}->IsNumber()) {\n");
+                    push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
+                    push(@implContentDecls, "        return notHandledByInterceptor();\n");
+                    push(@implContentDecls, "    }\n");
+                } elsif (IsWrapperType($argType)) {
+                    push(@implContentDecls, "    if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !V8${argType}::HasInstance($argValue)) {\n");
                     push(@implContentDecls, "        V8Proxy::throwTypeError();\n");
                     push(@implContentDecls, "        return notHandledByInterceptor();\n");
@@ -2712 +2746 @@
         if ($parameter->type eq "NodeFilter" || $parameter->type eq "XPathNSResolver") {
             $functionString .= "$paramName.get()";
+        } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($parameter->type) and not $implClassName =~ /List$/) {
+            $functionString .= "$paramName->propertyReference()";
+            $result .= $indent . "if (!$paramName) {\n";
+            $result .= $indent . "    V8Proxy::setDOMException(WebCore::TYPE_MISMATCH_ERR);\n";
+            $result .= $indent . "    return v8::Handle<v8::Value>();\n";
+            $result .= $indent . "}\n";
         } else {
             $functionString .= $paramName;
@@ -2776 +2816 @@
         $return = "wrapper";
     }
-    
-    my $svgLivePropertyType = $function->signature->extendedAttributes->{"SVGLiveProperty"};
-    if ($svgLivePropertyType) {
+
+    if ($codeGenerator->IsSVGTypeNeedingTearOff($returnType) and not $implClassName =~ /List$/) {
         $implIncludes{"V8$returnType.h"} = 1;
         $implIncludes{"SVGPropertyTearOff.h"} = 1;
-        return $indent . "return toV8(SVGPropertyTearOff<$returnType>::create($return).get());\n";
+        return $indent . "return toV8(WTF::getPtr(SVGPropertyTearOff<$returnType>::create($return)));\n";
     }
 
@@ -2903 +2942 @@
     return "AffineTransform" if $type eq "SVGMatrix";
     return "SVGTransform" if $type eq "SVGTransform";
-    return "SVGAngle" if $type eq "SVGAngle";
+    return "RefPtr<SVGPropertyTearOff<SVGAngle> >" if $type eq "SVGAngle";
     return "RefPtr<SVGPropertyTearOff<SVGLength> >" if $type eq "SVGLength";
     return "SVGListPropertyTearOff<SVGLengthList>*" if $type eq "SVGLengthList";
@@ -2957 +2996 @@
     my $type = GetTypeFromSignature($signature);
 
-    return 1 if $type eq "SVGAngle";
     return 1 if $type eq "SVGMatrix";
     return 1 if $type eq "SVGPoint";
@@ -3281 +3319 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub GenerateSVGStaticPodTypeWrapper {
     my $type = shift;
@@ -3335 +3374 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub IsSVGTypeNeedingContextParameter
 {
@@ -3341 +3381 @@
     return 0 if $codeGenerator->IsSVGNewStyleAnimatedType($implClassName);
     if ($implClassName =~ /SVG/ and not $implClassName =~ /Element/) {
-        return 1 unless $implClassName =~ /SVGPaint/ or $implClassName =~ /SVGColor/ or $implClassName =~ /SVGDocument/ or $implClassName =~ /SVGLength/ or $implClassName =~/SVGLengthList/;
+        return 1 unless $implClassName =~ /SVGAngle/
+                     or $implClassName =~ /SVGPaint/
+                     or $implClassName =~ /SVGColor/
+                     or $implClassName =~ /SVGDocument/
+                     or $implClassName =~ /SVGLength/
+                     or $implClassName =~ /SVGLengthList/;
     }
 
@@ -3347 +3392 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub GenerateSVGContextAssignment
 {
@@ -3359 +3405 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub GenerateSVGContextRetrieval
 {

trunk/WebCore/svg/DeprecatedSVGAnimatedPropertyTraits.h

@@ -25 +25 @@
 #include "FloatRect.h"
 #include "PlatformString.h"
-#include "SVGAngle.h"
 #include "SVGNumberList.h"
 #include "SVGPreserveAspectRatio.h"
@@ -34 +33 @@
 template<typename Type>
 struct DeprecatedSVGAnimatedPropertyTraits : public Noncopyable { };
-
-// SVGAnimatedAngle
-template<>
-struct DeprecatedSVGAnimatedPropertyTraits<SVGAngle> : public Noncopyable {
-    typedef const SVGAngle& PassType;
-    typedef SVGAngle ReturnType;
-    typedef SVGAngle StoredType;
-
-    static ReturnType null() { return SVGAngle(); }
-    static ReturnType toReturnType(const StoredType& type) { return type; }
-    static String toString(PassType type) { return type.valueAsString(); }
-};
 
 // SVGAnimatedBoolean

trunk/WebCore/svg/DeprecatedSVGAnimatedTemplate.h

@@ -29 +29 @@
 namespace WebCore {
    
-    class SVGAngle;
     class SVGElement;
     class SVGNumberList;
@@ -156 +155 @@
 
     // Common type definitions, to ease IDL generation.
-    typedef DeprecatedSVGAnimatedTemplate<SVGAngle> SVGAnimatedAngle;
     typedef DeprecatedSVGAnimatedTemplate<bool> SVGAnimatedBoolean;
     typedef DeprecatedSVGAnimatedTemplate<int> SVGAnimatedEnumeration;

trunk/WebCore/svg/SVGAngle.cpp

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
+ * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -20 +21 @@
 
 #include "config.h"
+
+#if ENABLE(SVG)
 #include "SVGAngle.h"
 
-#if ENABLE(SVG)
-
+#include "SVGParserUtilities.h"
+#include <wtf/text/StringConcatenate.h>
 #include <wtf/MathExtras.h>
 
@@ -29 +32 @@
 
 SVGAngle::SVGAngle()
-    : m_unitType(SVG_ANGLETYPE_UNKNOWN)
-    , m_value(0)
+    : m_unitType(SVG_ANGLETYPE_UNSPECIFIED)
     , m_valueInSpecifiedUnits(0)
 {
 }
 
+float SVGAngle::value() const
+{
+    switch (m_unitType) {
+    case SVG_ANGLETYPE_GRAD:
+        return grad2deg(m_valueInSpecifiedUnits);
+    case SVG_ANGLETYPE_RAD:
+        return rad2deg(m_valueInSpecifiedUnits);
+    case SVG_ANGLETYPE_UNSPECIFIED:
+    case SVG_ANGLETYPE_UNKNOWN:
+    case SVG_ANGLETYPE_DEG:
+        return m_valueInSpecifiedUnits;
+    }
+
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
 void SVGAngle::setValue(float value)
 {
-    m_value = value;
-}
-
-// calc m_value
-void SVGAngle::calculate()
-{
-    if (m_unitType == SVG_ANGLETYPE_GRAD)
-        m_value = grad2deg(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_RAD)
-        m_value = rad2deg(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_UNSPECIFIED || m_unitType == SVG_ANGLETYPE_DEG)
-        m_value = m_valueInSpecifiedUnits;
-}
-
-void SVGAngle::setValueInSpecifiedUnits(float valueInSpecifiedUnits)
-{
+    switch (m_unitType) {
+    case SVG_ANGLETYPE_GRAD:
+        m_valueInSpecifiedUnits = deg2grad(value);
+        break;
+    case SVG_ANGLETYPE_RAD:
+        m_valueInSpecifiedUnits = deg2rad(value);
+        break;
+    case SVG_ANGLETYPE_UNSPECIFIED:
+    case SVG_ANGLETYPE_UNKNOWN:
+    case SVG_ANGLETYPE_DEG:
+        m_valueInSpecifiedUnits = value;
+        break;
+    }
+}
+
+inline SVGAngle::SVGAngleType stringToAngleType(const UChar*& ptr, const UChar* end)
+{
+    // If there's no unit given, the angle type is unspecified.
+    if (ptr == end)
+        return SVGAngle::SVG_ANGLETYPE_UNSPECIFIED;
+
+    const UChar firstChar = *ptr;
+    
+    // If the unit contains only one character, the angle type is unknown.
+    ++ptr;
+    if (ptr == end)
+        return SVGAngle::SVG_ANGLETYPE_UNKNOWN;
+
+    const UChar secondChar = *ptr;
+ 
+    // If the unit contains only two characters, the angle type is unknown.
+    ++ptr;
+    if (ptr == end)
+        return SVGAngle::SVG_ANGLETYPE_UNKNOWN;
+
+    const UChar thirdChar = *ptr;
+    if (firstChar == 'd' && secondChar == 'e' && thirdChar == 'g')
+        return SVGAngle::SVG_ANGLETYPE_DEG;
+    if (firstChar == 'r' && secondChar == 'a' && thirdChar == 'd')
+        return SVGAngle::SVG_ANGLETYPE_RAD;
+
+    // If the unit contains three characters, but is not deg or rad, then it's unknown.
+    ++ptr;
+    if (ptr == end)
+        return SVGAngle::SVG_ANGLETYPE_UNKNOWN;
+
+    const UChar fourthChar = *ptr;
+
+    if (firstChar == 'g' && secondChar == 'r' && thirdChar == 'a' && fourthChar == 'd')
+        return SVGAngle::SVG_ANGLETYPE_GRAD;
+
+    return SVGAngle::SVG_ANGLETYPE_UNKNOWN;
+}
+
+String SVGAngle::valueAsString() const
+{
+    switch (m_unitType) {
+    case SVG_ANGLETYPE_DEG:
+        return makeString(String::number(m_valueInSpecifiedUnits), "deg");
+    case SVG_ANGLETYPE_RAD:
+        return makeString(String::number(m_valueInSpecifiedUnits), "rad");
+    case SVG_ANGLETYPE_GRAD:
+        return makeString(String::number(m_valueInSpecifiedUnits), "grad");
+    case SVG_ANGLETYPE_UNSPECIFIED:
+    case SVG_ANGLETYPE_UNKNOWN:
+        return makeString(String::number(m_valueInSpecifiedUnits));
+    }
+
+    ASSERT_NOT_REACHED();
+    return String();
+}
+
+void SVGAngle::setValueAsString(const String& value, ExceptionCode& ec)
+{
+    if (value.isEmpty()) {
+        m_unitType = SVG_ANGLETYPE_UNSPECIFIED;
+        return;
+    }
+
+    float valueInSpecifiedUnits = 0;
+    const UChar* ptr = value.characters();
+    const UChar* end = ptr + value.length();
+
+    if (!parseNumber(ptr, end, valueInSpecifiedUnits, false)) {
+        ec = SYNTAX_ERR;
+        return;
+    }
+
+    SVGAngleType unitType = stringToAngleType(ptr, end);
+    if (unitType == SVG_ANGLETYPE_UNKNOWN) {
+        ec = SYNTAX_ERR;
+        return;
+    }
+
+    m_unitType = unitType;
     m_valueInSpecifiedUnits = valueInSpecifiedUnits;
-    calculate();
-}
-
-void SVGAngle::setValueAsString(const String& s)
-{
-    m_valueAsString = s;
-
-    bool bOK;
-    m_valueInSpecifiedUnits = m_valueAsString.toFloat(&bOK);
-    m_unitType = SVG_ANGLETYPE_UNSPECIFIED;
-
-    if (!bOK) {
-        if (m_valueAsString.endsWith("deg"))
-            m_unitType = SVG_ANGLETYPE_DEG;
-        else if (m_valueAsString.endsWith("grad"))
-            m_unitType = SVG_ANGLETYPE_GRAD;
-        else if (m_valueAsString.endsWith("rad"))
-            m_unitType = SVG_ANGLETYPE_RAD;
-    }
-    
-    calculate();
-}
-
-String SVGAngle::valueAsString() const
-{
-    m_valueAsString = String::number(m_valueInSpecifiedUnits);
-
-    switch (m_unitType) {
+}
+
+void SVGAngle::newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits, ExceptionCode& ec)
+{
+    if (unitType == SVG_ANGLETYPE_UNKNOWN || unitType > SVG_ANGLETYPE_GRAD) {
+        ec = NOT_SUPPORTED_ERR;
+        return;
+    }
+
+    if (unitType != m_unitType)
+        m_unitType = static_cast<SVGAngleType>(unitType);
+
+    m_valueInSpecifiedUnits = valueInSpecifiedUnits;
+}
+
+void SVGAngle::convertToSpecifiedUnits(unsigned short unitType, ExceptionCode& ec)
+{
+    if (unitType == SVG_ANGLETYPE_UNKNOWN || m_unitType == SVG_ANGLETYPE_UNKNOWN || unitType > SVG_ANGLETYPE_GRAD) {
+        ec = NOT_SUPPORTED_ERR;
+        return;
+    }
+
+    if (unitType == m_unitType)
+        return;
+
+    switch (m_unitType) {
+    case SVG_ANGLETYPE_RAD:
+        switch (unitType) {
+        case SVG_ANGLETYPE_GRAD:
+            m_valueInSpecifiedUnits = rad2grad(m_valueInSpecifiedUnits);
+            break;
         case SVG_ANGLETYPE_UNSPECIFIED:
         case SVG_ANGLETYPE_DEG:
-            m_valueAsString += "deg";
+            m_valueInSpecifiedUnits = rad2deg(m_valueInSpecifiedUnits);
             break;
         case SVG_ANGLETYPE_RAD:
-            m_valueAsString += "rad";
+        case SVG_ANGLETYPE_UNKNOWN:
+            ASSERT_NOT_REACHED();
+            break;
+        }
+        break;
+    case SVG_ANGLETYPE_GRAD:
+        switch (unitType) {
+        case SVG_ANGLETYPE_RAD:
+            m_valueInSpecifiedUnits = grad2rad(m_valueInSpecifiedUnits);
+            break;
+        case SVG_ANGLETYPE_UNSPECIFIED:
+        case SVG_ANGLETYPE_DEG:
+            m_valueInSpecifiedUnits = grad2deg(m_valueInSpecifiedUnits);
             break;
         case SVG_ANGLETYPE_GRAD:
-            m_valueAsString += "grad";
-            break;
         case SVG_ANGLETYPE_UNKNOWN:
-            break;
-    }
-    
-    return m_valueAsString;
-}
-
-void SVGAngle::newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits)
-{
-    m_unitType = (SVGAngleType)unitType;
-    m_valueInSpecifiedUnits = valueInSpecifiedUnits;
-    calculate();
-}
-
-void SVGAngle::convertToSpecifiedUnits(unsigned short unitType)
-{
-    if (m_unitType == unitType)
-        return;
-
-    if (m_unitType == SVG_ANGLETYPE_DEG && unitType == SVG_ANGLETYPE_RAD)
-        m_valueInSpecifiedUnits = deg2rad(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_GRAD && unitType == SVG_ANGLETYPE_RAD)
-        m_valueInSpecifiedUnits = grad2rad(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_DEG && unitType == SVG_ANGLETYPE_GRAD)
-        m_valueInSpecifiedUnits = deg2grad(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_RAD && unitType == SVG_ANGLETYPE_GRAD)
-        m_valueInSpecifiedUnits = rad2grad(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_RAD && unitType == SVG_ANGLETYPE_DEG)
-        m_valueInSpecifiedUnits = rad2deg(m_valueInSpecifiedUnits);
-    else if (m_unitType == SVG_ANGLETYPE_GRAD && unitType == SVG_ANGLETYPE_DEG)
-        m_valueInSpecifiedUnits = grad2deg(m_valueInSpecifiedUnits);
-
-    m_unitType = (SVGAngleType)unitType;
+            ASSERT_NOT_REACHED();
+            break;
+        }
+        break;
+    case SVG_ANGLETYPE_UNSPECIFIED:
+        // Spec: For angles, a unitless value is treated the same as if degrees were specified.
+    case SVG_ANGLETYPE_DEG:
+        switch (unitType) {
+        case SVG_ANGLETYPE_RAD:
+            m_valueInSpecifiedUnits = deg2rad(m_valueInSpecifiedUnits);
+            break;
+        case SVG_ANGLETYPE_GRAD:
+            m_valueInSpecifiedUnits = deg2grad(m_valueInSpecifiedUnits);
+            break;
+        case SVG_ANGLETYPE_UNSPECIFIED:
+            break;
+        case SVG_ANGLETYPE_DEG:
+        case SVG_ANGLETYPE_UNKNOWN:
+            ASSERT_NOT_REACHED();
+            break;
+        }
+        break;
+    case SVG_ANGLETYPE_UNKNOWN:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+
+    m_unitType = static_cast<SVGAngleType>(unitType);
 }
 

trunk/WebCore/svg/SVGAngle.h

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
+ * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -23 +24 @@
 
 #if ENABLE(SVG)
-#include "PlatformString.h"
+#include "ExceptionCode.h"
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-    class SVGAngle {
-    public:
-        SVGAngle();
+class SVGAngle {
+public:
+    SVGAngle();
 
-        enum SVGAngleType {
-            SVG_ANGLETYPE_UNKNOWN           = 0,
-            SVG_ANGLETYPE_UNSPECIFIED       = 1,
-            SVG_ANGLETYPE_DEG               = 2,
-            SVG_ANGLETYPE_RAD               = 3,
-            SVG_ANGLETYPE_GRAD              = 4
-        };
+    enum SVGAngleType {
+        SVG_ANGLETYPE_UNKNOWN = 0,
+        SVG_ANGLETYPE_UNSPECIFIED = 1,
+        SVG_ANGLETYPE_DEG = 2,
+        SVG_ANGLETYPE_RAD = 3,
+        SVG_ANGLETYPE_GRAD = 4
+    };
 
-        SVGAngleType unitType() const { return m_unitType; }
+    SVGAngleType unitType() const { return m_unitType; }
 
-        void setValue(float);
-        float value() const { return m_value; }
+    void setValue(float);
+    float value() const;
 
-        void setValueInSpecifiedUnits(float valueInSpecifiedUnits);
-        float valueInSpecifiedUnits() const { return m_valueInSpecifiedUnits; }
+    void setValueInSpecifiedUnits(float valueInSpecifiedUnits) { m_valueInSpecifiedUnits = valueInSpecifiedUnits; }
+    float valueInSpecifiedUnits() const { return m_valueInSpecifiedUnits; }
 
-        void setValueAsString(const String&);
-        String valueAsString() const;
+    void setValueAsString(const String&, ExceptionCode&);
+    String valueAsString() const;
 
-        void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
-        void convertToSpecifiedUnits(unsigned short unitType);
+    void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits, ExceptionCode&);
+    void convertToSpecifiedUnits(unsigned short unitType, ExceptionCode&);
 
-    private:
-        SVGAngleType m_unitType;
-        float m_value;
-        float m_valueInSpecifiedUnits;
-        mutable String m_valueAsString;
-
-        void calculate();
-    };
+private:
+    SVGAngleType m_unitType;
+    float m_valueInSpecifiedUnits;
+};
 
 } // namespace WebCore

trunk/WebCore/svg/SVGAngle.idl

@@ -23 +23 @@
 module svg {
 
-    interface [Conditional=SVG, PODType=SVGAngle] SVGAngle { 
+    interface [Conditional=SVG, SVGProperty=SVGAngle] SVGAngle { 
         // Angle Unit Types
-        const unsigned short SVG_ANGLETYPE_UNKNOWN     = 0;
+        const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
         const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
-        const unsigned short SVG_ANGLETYPE_DEG         = 2;
-        const unsigned short SVG_ANGLETYPE_RAD         = 3;
-        const unsigned short SVG_ANGLETYPE_GRAD        = 4;
-        
+        const unsigned short SVG_ANGLETYPE_DEG = 2;
+        const unsigned short SVG_ANGLETYPE_RAD = 3;
+        const unsigned short SVG_ANGLETYPE_GRAD = 4;
+
         readonly attribute unsigned short unitType;
-                 attribute float          value;
-                 attribute float          valueInSpecifiedUnits;
-                 attribute [ConvertNullToNullString] DOMString      valueAsString;
-        
-        void newValueSpecifiedUnits(in unsigned short unitType, 
-                                    in float valueInSpecifiedUnits);
-        void convertToSpecifiedUnits(in unsigned short unitType);
+        attribute [StrictTypeChecking] float value;
+        attribute [StrictTypeChecking] float valueInSpecifiedUnits;
+
+        attribute [ConvertNullToNullString] DOMString valueAsString
+            setter raises(DOMException);
+
+        void newValueSpecifiedUnits(in unsigned short unitType, in float valueInSpecifiedUnits)
+            raises(DOMException);
+
+        void convertToSpecifiedUnits(in unsigned short unitType)
+            raises(DOMException);
     };
 

trunk/WebCore/svg/SVGAnimatedAngle.idl

@@ -26 +26 @@
 module svg {
 
-    interface [Conditional=SVG] SVGAnimatedAngle {
+    interface [Conditional=SVG, SVGAnimatedProperty] SVGAnimatedAngle {
         readonly attribute SVGAngle baseVal;
         readonly attribute SVGAngle animVal;

trunk/WebCore/svg/SVGMarkerElement.cpp

@@ -82 +82 @@
             setOrientTypeBaseValue(SVG_MARKER_ORIENT_AUTO);
         else {
-            angle.setValueAsString(attr->value());
+            ExceptionCode ec = 0;
+            angle.setValueAsString(attr->value(), ec);
             setOrientTypeBaseValue(SVG_MARKER_ORIENT_ANGLE);
         }

trunk/WebCore/svg/SVGMarkerElement.h

@@ -83 +83 @@
     DECLARE_ANIMATED_PROPERTY(SVGMarkerElement, SVGNames::markerUnitsAttr, int, MarkerUnits, markerUnits)
     DECLARE_ANIMATED_PROPERTY_MULTIPLE_WRAPPERS(SVGMarkerElement, SVGNames::orientAttr, SVGOrientTypeAttrIdentifier, int, OrientType, orientType)
-    DECLARE_ANIMATED_PROPERTY_MULTIPLE_WRAPPERS(SVGMarkerElement, SVGNames::orientAttr, SVGOrientAngleAttrIdentifier, SVGAngle, OrientAngle, orientAngle)
+    DECLARE_ANIMATED_PROPERTY_NEW_MULTIPLE_WRAPPERS(SVGMarkerElement, SVGNames::orientAttr, SVGOrientAngleAttrIdentifier, SVGAngle, OrientAngle, orientAngle)
 
     // SVGExternalResourcesRequired

trunk/WebCore/svg/SVGNumber.idl

@@ -24 +24 @@
 
     interface [Conditional=SVG, PODType=float] SVGNumber {
-                 attribute float value
-                     setter raises(DOMException);
+        attribute float value;
     };
 

trunk/WebCore/svg/SVGPoint.idl

@@ -24 +24 @@
 
     interface [Conditional=SVG, PODType=FloatPoint] SVGPoint {
-                 attribute float x
-                     setter raises(DOMException);
-                 attribute float y
-                     setter raises(DOMException);
+        attribute float x;
+        attribute float y;
 
         SVGPoint matrixTransform(in SVGMatrix matrix);

trunk/WebCore/svg/SVGRect.idl

@@ -24 +24 @@
 
     interface [Conditional=SVG, PODType=FloatRect] SVGRect {
-                 attribute float x
-                     setter raises(DOMException);
-                 attribute float y
-                     setter raises(DOMException);
-                 attribute float width
-                     setter raises(DOMException);
-                 attribute float height
-                     setter raises(DOMException);
+        attribute float x;
+        attribute float y;
+        attribute float width;
+        attribute float height;
     };
 

trunk/WebCore/svg/SVGSVGElement.idl

@@ -74 +74 @@
 
         SVGNumber createSVGNumber();
-        [SVGLiveProperty] SVGLength createSVGLength();
+        SVGLength createSVGLength();
         SVGAngle createSVGAngle();
         SVGPoint createSVGPoint();