Changeset 70631 in webkit

Timestamp:

Oct 27, 2010 3:26:56 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

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

Reviewed by Rob Buis.

Convert SVGRect to the new SVGPropertyTearOff concept
​https://bugs.webkit.org/show_bug.cgi?id=48204

Convert the next SVG primitive type to use the SVGPropertyTearOff concept: SVGRect.
Added new test verifying that StrictTypeChecking is enabled for SVGRect. Refactor and share code between JSC/V8/ObjC generators.

Test: svg/dom/SVGRect.html

• GNUmakefile.am: Add SVGAnimatedRect.h to build.
• WebCore.gypi: Ditto.
• WebCore.pro: Ditto.
• WebCore.vcproj/WebCore.vcproj: Ditto.
• WebCore.xcodeproj/project.pbxproj: Ditto.
• bindings/scripts/CodeGenerator.pm: Refactor SVGPropertyTearOff handling, and share code between JSC/V8/ObjC generators.
• bindings/scripts/CodeGeneratorJS.pm: Ditto.
• bindings/scripts/CodeGeneratorObjC.pm: Ditto.
• bindings/scripts/CodeGeneratorV8.pm: Ditto.
• svg/DeprecatedSVGAnimatedPropertyTraits.h: Remove SVGAnimatedRect handling.
• svg/DeprecatedSVGAnimatedTemplate.h: Ditto.
• svg/SVGAngle.idl: Remove [SVGProperty] flag.
• svg/SVGAnimatedAngle.idl: Remove [SVGAnimatedProperty] flag.
• svg/SVGAnimatedLength.idl: Ditto.
• svg/SVGAnimatedLengthList.idl: Ditto.
• svg/SVGAnimatedRect.h: Added.
• svg/SVGFitToViewBox.h: SVGRect now uses the new tear off concept, adapt code.
• svg/SVGLength.idl: Remove [SVGProperty] flag.
• svg/SVGMarkerElement.h:
• svg/SVGPatternElement.h:
• svg/SVGRect.idl: Remove [PODType] flag, add StrictTypeChecking to all attributes.
• svg/SVGSVGElement.cpp: s/setViewBox/setViewBoxBaseValue/. (WebCore::SVGSVGElement::currentView): (WebCore::SVGSVGElement::inheritViewAttributes):
• svg/SVGSVGElement.h:
• svg/SVGSVGElement.idl: Remove [Immutable] flags for SVGRect types, no longer needed.
• svg/SVGSymbolElement.h:
• svg/SVGViewElement.h:
• svg/SVGViewSpec.cpp: Take a SVGElement as context element. (WebCore::SVGViewSpec::SVGViewSpec):
• svg/SVGViewSpec.h: Ditto. (WebCore::SVGViewSpec::contextElement):
• svg/SVGZoomEvent.idl: Remove [Immutable] flags for SVGRect types, no longer needed.
• svg/properties/SVGAnimatedPropertyMacros.h: Support declaring animated properties on non-SVGElement types (here: SVGViewSpec), just like the old macros handled it.

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

Reviewed by Rob Buis.

Convert SVGRect to the new SVGPropertyTearOff concept
​https://bugs.webkit.org/show_bug.cgi?id=48204

Added new test verifying that StrictTypeChecking is enabled for SVGRect.

• svg/dom/SVGRect-expected.txt: Added.
• svg/dom/SVGRect.html: Added.
• svg/dom/script-tests/SVGRect.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGRect-expected.txt (added)
• LayoutTests/svg/dom/SVGRect.html (added)
• LayoutTests/svg/dom/script-tests/SVGRect.js (added)
• 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) (5 diffs)
• WebCore/bindings/scripts/CodeGenerator.pm (modified) (5 diffs)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (13 diffs)
• WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (14 diffs)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (21 diffs)
• WebCore/svg/DeprecatedSVGAnimatedPropertyTraits.h (modified) (1 diff)
• WebCore/svg/DeprecatedSVGAnimatedTemplate.h (modified) (1 diff)
• WebCore/svg/SVGAngle.idl (modified) (1 diff)
• WebCore/svg/SVGAnimatedAngle.idl (modified) (1 diff)
• WebCore/svg/SVGAnimatedLength.idl (modified) (1 diff)
• WebCore/svg/SVGAnimatedLengthList.idl (modified) (1 diff)
• WebCore/svg/SVGAnimatedRect.h (added)
• WebCore/svg/SVGFitToViewBox.h (modified) (1 diff)
• WebCore/svg/SVGLength.idl (modified) (1 diff)
• WebCore/svg/SVGMarkerElement.h (modified) (1 diff)
• WebCore/svg/SVGPatternElement.h (modified) (1 diff)
• WebCore/svg/SVGRect.idl (modified) (1 diff)
• WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)
• WebCore/svg/SVGSVGElement.h (modified) (1 diff)
• WebCore/svg/SVGSVGElement.idl (modified) (2 diffs)
• WebCore/svg/SVGSymbolElement.h (modified) (2 diffs)
• WebCore/svg/SVGViewElement.h (modified) (2 diffs)
• WebCore/svg/SVGViewSpec.cpp (modified) (1 diff)
• WebCore/svg/SVGViewSpec.h (modified) (4 diffs)
• WebCore/svg/SVGZoomEvent.idl (modified) (1 diff)
• WebCore/svg/properties/SVGAnimatedPropertyMacros.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-26  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Rob Buis.
+
+        Convert SVGRect to the new SVGPropertyTearOff concept
+        https://bugs.webkit.org/show_bug.cgi?id=48204
+
+        Added new test verifying that StrictTypeChecking is enabled for SVGRect.
+
+        * svg/dom/SVGRect-expected.txt: Added.
+        * svg/dom/SVGRect.html: Added.
+        * svg/dom/script-tests/SVGRect.js: Added.
+
 2010-10-27  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-26  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Rob Buis.
+
+        Convert SVGRect to the new SVGPropertyTearOff concept
+        https://bugs.webkit.org/show_bug.cgi?id=48204
+
+        Convert the next SVG primitive type to use the SVGPropertyTearOff concept: SVGRect.
+        Added new test verifying that StrictTypeChecking is enabled for SVGRect. Refactor and share code between JSC/V8/ObjC generators.
+
+        Test: svg/dom/SVGRect.html
+
+        * GNUmakefile.am: Add SVGAnimatedRect.h to build.
+        * WebCore.gypi: Ditto.
+        * WebCore.pro: Ditto.
+        * WebCore.vcproj/WebCore.vcproj: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+        * bindings/scripts/CodeGenerator.pm: Refactor SVGPropertyTearOff handling, and share code between JSC/V8/ObjC generators.
+        * bindings/scripts/CodeGeneratorJS.pm: Ditto.
+        * bindings/scripts/CodeGeneratorObjC.pm: Ditto.
+        * bindings/scripts/CodeGeneratorV8.pm: Ditto.
+        * svg/DeprecatedSVGAnimatedPropertyTraits.h: Remove SVGAnimatedRect handling.
+        * svg/DeprecatedSVGAnimatedTemplate.h: Ditto.
+        * svg/SVGAngle.idl: Remove [SVGProperty] flag.
+        * svg/SVGAnimatedAngle.idl: Remove [SVGAnimatedProperty] flag.
+        * svg/SVGAnimatedLength.idl: Ditto.
+        * svg/SVGAnimatedLengthList.idl: Ditto.
+        * svg/SVGAnimatedRect.h: Added.
+        * svg/SVGFitToViewBox.h: SVGRect now uses the new tear off concept, adapt code.
+        * svg/SVGLength.idl: Remove [SVGProperty] flag.
+        * svg/SVGMarkerElement.h:
+        * svg/SVGPatternElement.h:
+        * svg/SVGRect.idl: Remove [PODType] flag, add StrictTypeChecking to all attributes.
+        * svg/SVGSVGElement.cpp: s/setViewBox/setViewBoxBaseValue/.
+        (WebCore::SVGSVGElement::currentView):
+        (WebCore::SVGSVGElement::inheritViewAttributes):
+        * svg/SVGSVGElement.h:
+        * svg/SVGSVGElement.idl: Remove [Immutable] flags for SVGRect types, no longer needed.
+        * svg/SVGSymbolElement.h:
+        * svg/SVGViewElement.h:
+        * svg/SVGViewSpec.cpp: Take a SVGElement as context element.
+        (WebCore::SVGViewSpec::SVGViewSpec):
+        * svg/SVGViewSpec.h: Ditto.
+        (WebCore::SVGViewSpec::contextElement):
+        * svg/SVGZoomEvent.idl: Remove [Immutable] flags for SVGRect types, no longer needed.
+        * svg/properties/SVGAnimatedPropertyMacros.h: Support declaring animated properties on non-SVGElement types (here: SVGViewSpec), just like the old macros handled it.
+
 2010-10-27  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/GNUmakefile.am

@@ -3042 +3042 @@
         WebCore/svg/SVGAnimatedPoints.cpp \
         WebCore/svg/SVGAnimatedPoints.h \
+        WebCore/svg/SVGAnimatedRect.h \
         WebCore/svg/SVGAnimateElement.cpp \
         WebCore/svg/SVGAnimateElement.h \

trunk/WebCore/WebCore.gypi

@@ -3974 +3974 @@
             'svg/SVGAnimatedPoints.cpp',
             'svg/SVGAnimatedPoints.h',
+            'svg/SVGAnimatedRect.h',
             'svg/SVGAnimationElement.cpp',
             'svg/SVGAnimationElement.h',

trunk/WebCore/WebCore.pro

@@ -2366 +2366 @@
     svg/SVGAnimatedPathData.h \
     svg/SVGAnimatedPoints.h \
+    svg/SVGAnimatedRect.h \
     svg/SVGAnimateElement.h \
     svg/SVGAnimateMotionElement.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -61497 +61497 @@
                         </File>
                         <File
+                                RelativePath="..\svg\SVGAnimatedRect.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\svg\SVGAnimateElement.h"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -226 +226 @@
                 08C6A7AC117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C6A7AA117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h */; };
                 08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
+                08C859C01274575400A5728D /* SVGAnimatedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C859BF1274575300A5728D /* SVGAnimatedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 08C925190FCC7C4A00480DEC /* FilterEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */; };
                 08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C925180FCC7C4A00480DEC /* FilterEffect.h */; };
@@ -6219 +6220 @@
                 08C6A7A9117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceSolidColor.cpp; sourceTree = "<group>"; };
                 08C6A7AA117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceSolidColor.h; sourceTree = "<group>"; };
+                08C859BF1274575300A5728D /* SVGAnimatedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedRect.h; sourceTree = "<group>"; };
                 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FilterEffect.cpp; path = filters/FilterEffect.cpp; sourceTree = "<group>"; };
                 08C925180FCC7C4A00480DEC /* FilterEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterEffect.h; path = filters/FilterEffect.h; sourceTree = "<group>"; };
@@ -15980 +15982 @@
                                 B22277F30D00BF1F0071B782 /* SVGAnimatedPoints.idl */,
                                 B22277F40D00BF1F0071B782 /* SVGAnimatedPreserveAspectRatio.idl */,
+                                08C859BF1274575300A5728D /* SVGAnimatedRect.h */,
                                 B22277F50D00BF1F0071B782 /* SVGAnimatedRect.idl */,
                                 B22277F60D00BF1F0071B782 /* SVGAnimatedString.idl */,
@@ -21176 +21179 @@
                                 8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */,
                                 087B84961272CEC800A14417 /* SVGAnimatedAngle.h in Headers */,
+                                08C859C01274575400A5728D /* SVGAnimatedRect.h in Headers */,
                                 758978ED127090D60076D5A9 /* SpeechInputResult.h in Headers */,
                         );
@@ -21236 +21240 @@
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
                         compatibilityVersion = "Xcode 2.4";
-                        developmentRegion = English;
                         hasScannedForEncodings = 1;
                         knownRegions = (

trunk/WebCore/bindings/scripts/CodeGenerator.pm

@@ -52 +52 @@
 
 my %podTypeHash = ("SVGNumber" => 1, "SVGTransform" => 1);
-my %podTypesWithWritablePropertiesHash = ("SVGMatrix" => 1, "SVGPoint" => 1, "SVGPreserveAspectRatio" => 1, "SVGRect" => 1);
+my %podTypesWithWritablePropertiesHash = ("SVGMatrix" => 1, "SVGPoint" => 1, "SVGPreserveAspectRatio" => 1);
 my %stringTypeHash = ("DOMString" => 1, "AtomicString" => 1);
 
 my %nonPointerTypeHash = ("DOMTimeStamp" => 1, "CompareHow" => 1, "SVGPaintType" => 1);
 
-my %svgTypeNeedingTearOffHash = ("SVGLength" => 1, "SVGAngle" => 1);
-
-my %svgNewStyleAnimatedTypeHash = ("SVGAnimatedAngle" => 1, "SVGAnimatedLength" => 1, "SVGAnimatedLengthList" => 1);
+my %svgNewStyleAnimatedTypeHash = ("SVGAnimatedAngle" => 1, "SVGAnimatedLength" => 1, "SVGAnimatedLengthList" => 1, "SVGAnimatedRect" => 1);
 
 my %svgAnimatedTypeHash = ("SVGAnimatedAngle" => 1, "SVGAnimatedBoolean" => 1,
@@ -74 +72 @@
                                "onmouseup" => 1, "onresize" => 1, "onscroll" => 1,
                                "onunload" => 1);
+
+my %svgNativeType = (
+    "SVGAngle" => "SVGPropertyTearOff<SVGAngle>",
+    "SVGLength" => "SVGPropertyTearOff<SVGLength>",
+    "SVGLengthList" => "SVGListPropertyTearOff<SVGLengthList>",
+    "SVGRect" => "SVGPropertyTearOff<FloatRect>"
+);
 
 # Cache of IDL file pathnames.
@@ -288 +293 @@
 # Helpers for all CodeGenerator***.pm modules
 
+sub AvoidInclusionOfType
+{
+    my $object = shift;
+    my $type = shift;
+
+    # Special case: SVGRect.h / SVGPoint.h / SVGNumber.h / SVGMatrix.h do not exist.
+    return 1 if $type eq "SVGRect" or $type eq "SVGPoint" or $type eq "SVGNumber" or $type eq "SVGMatrix";
+    return 0;
+}
+
 # FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub IsPodType
@@ -345 +360 @@
 }
 
-
 sub IsSVGTypeNeedingTearOff
 {
@@ -351 +365 @@
     my $type = shift;
 
-    return 1 if $svgTypeNeedingTearOffHash{$type};
-    return 0;
+    return 1 if exists $svgNativeType{$type};
+    return 0;
+}
+
+sub GetSVGTypeNeedingTearOff
+{
+    my $object = shift;
+    my $type = shift;
+
+    return $svgNativeType{$type} if exists $svgNativeType{$type};
+    return undef;
+}
+
+sub GetSVGWrappedTypeNeedingTearOff
+{
+    my $object = shift;
+    my $type = shift;
+
+    my $svgNativeType = $object->GetSVGTypeNeedingTearOff($type);
+    return $svgNativeType if not $svgNativeType;
+
+    if ($svgNativeType =~ /SVGPropertyTearOff/) {
+        $svgNativeType =~ s/SVGPropertyTearOff<//;
+    } elsif ($svgNativeType =~ /SVGListPropertyTearOff/) {
+        $svgNativeType =~ s/SVGListPropertyTearOff<//;
+    }
+    $svgNativeType =~ s/>//;
+    return $svgNativeType;
 }
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -228 +228 @@
 }
 
-sub AvoidInclusionOfType
-{
-    my $type = shift;
-
-    # Special case: SVGRect.h / SVGPoint.h / SVGNumber.h / SVGMatrix.h do not exist.
-    return 1 if $type eq "SVGRect" or $type eq "SVGPoint" or $type eq "SVGNumber" or $type eq "SVGMatrix";
-    return 0;
-}
-
 sub IndexGetterReturnsStrings
 {
@@ -252 +243 @@
     # When we're finished with the one-file-per-class
     # reorganization, we won't need these special cases.
-    if ($codeGenerator->IsPrimitiveType($type) or AvoidInclusionOfType($type)
+    if ($codeGenerator->IsPrimitiveType($type) or $codeGenerator->AvoidInclusionOfType($type)
         or $type eq "DOMString" or $type eq "DOMObject" or $type eq "Array") {
     } elsif ($type =~ /SVGPathSeg/) {
@@ -285 +276 @@
 }
 
+# FIXME: This method will go away once all SVG animated properties are converted to the new scheme.
 sub AddIncludesForSVGAnimatedType
 {
@@ -335 +327 @@
     return 0 if $implClassName =~ /Element/;
     return 0 if $codeGenerator->IsSVGNewStyleAnimatedType($implClassName);
-
-    my @noContextNeeded = ("SVGAngle", "SVGLength", "SVGLengthList", "SVGPaint", "SVGColor", "SVGDocument", "SVGZoomEvent");
+    return 0 if $codeGenerator->IsSVGTypeNeedingTearOff($implClassName);
+
+    my @noContextNeeded = ("SVGColor", "SVGDocument", "SVGPaint", "SVGZoomEvent");
     foreach (@noContextNeeded) {
         return 0 if $implClassName eq $_;
@@ -674 +667 @@
     
     $headerIncludes{"<runtime/JSObjectWithGlobalObject.h>"} = 1;
-
     $headerIncludes{"SVGElement.h"} = 1 if $className =~ /^JSSVG/;
 
-    # Get correct pass/store types respecting PODType flag
     my $implType = $implClassName;
-
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};    
-    if ($svgPropertyType) {
-        $implType = "SVGPropertyTearOff<$svgPropertyType> ";
-        $headerIncludes{"SVGAnimatedProperty.h"} = 1;
-        $headerIncludes{"SVGPropertyTearOff.h"} = 1;
-        $headerIncludes{"$svgPropertyType.h"} = 1 if $svgPropertyType ne "float";
-    }
-
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};    
-    if ($svgListPropertyType) {
-        $implType = "SVGListPropertyTearOff<$svgListPropertyType> ";
-        $headerIncludes{"SVGAnimatedProperty.h"} = 1;
-        $headerIncludes{"SVGListPropertyTearOff.h"} = 1;
-        $headerIncludes{"$svgListPropertyType.h"} = 1;
-    }
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implType);
+    $implType = $svgNativeType if $svgNativeType;
 
     # FIXME: Old style SVG JS bindings, will vanish soon.
@@ -715 +692 @@
     push(@headerContent, "\nnamespace WebCore {\n\n");
 
-    my $svgAnimatedPropertyType = $dataNode->extendedAttributes->{"SVGAnimatedProperty"};   
-    $headerIncludes{"$implClassName.h"} = 1 if $svgAnimatedPropertyType;
-
-    # Implementation class forward declaration
-    AddClassForwardIfNeeded($implClassName) unless $svgPropertyOrPodType or $svgAnimatedPropertyType;
+    if ($codeGenerator->IsSVGNewStyleAnimatedType($implClassName)) {
+        $headerIncludes{"$implClassName.h"} = 1;
+    } else {
+        # Implementation class forward declaration
+        AddClassForwardIfNeeded($implClassName) unless $svgPropertyOrPodType;
+    }
+
     AddClassForwardIfNeeded("JSDOMWindowShell") if $interfaceName eq "DOMWindow";
 
@@ -1448 +1427 @@
     push(@implContent, "};\n\n");
 
-    # Get correct pass/store types respecting PODType flag
     my $implType = $implClassName;
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};    
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};    
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implType);
+    $implType = $svgNativeType if $svgNativeType;
+
     my $podType = $dataNode->extendedAttributes->{"PODType"};
-    if ($svgPropertyType) {
-        $implType = "SVGPropertyTearOff<$svgPropertyType> ";
-    } elsif ($svgListPropertyType) {
-        $implType = "SVGListPropertyTearOff<$svgListPropertyType> ";
-    } elsif ($podType) {
+    if ($podType) {
         $implType = "JSSVGPODTypeWrapper<$podType> ";
     }
@@ -1811 +1786 @@
                             # a TypeError is thrown instead of casting to null.
                             if ($attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
+                                $implIncludes{"<runtime/Error.h>"} = 1;
+
                                 my $argType = $attribute->signature->type;
                                 if (!IsNativeType($argType)) {
@@ -2078 +2055 @@
                             # a TypeError is thrown instead of casting to null.
                             if ($function->signature->extendedAttributes->{"StrictTypeChecking"}) {
+                                $implIncludes{"<runtime/Error.h>"} = 1;
+
                                 my $argValue = "exec->argument($argsIndex)";
                                 if (!IsNativeType($argType)) {
@@ -2471 +2450 @@
     "SerializedScriptValue" => "RefPtr<SerializedScriptValue>",
     "IDBKey" => "RefPtr<IDBKey>",
-    "SVGAngle" => "SVGPropertyTearOff<SVGAngle>*",
-    "SVGLength" => "SVGPropertyTearOff<SVGLength>*",
     "SVGMatrix" => "AffineTransform",
     "SVGNumber" => "float",
@@ -2494 +2471 @@
     my $type = shift;
 
+    my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
+    return "${svgNativeType}*" if $svgNativeType;
     return $nativeType{$type} if exists $nativeType{$type};
 
     # For all other types, the native type is a pointer with same type name as the IDL type.
     return "${type}*";
+}
+
+sub GetSVGPropertyTypes
+{
+    my $implType = shift;
+
+    my $svgPropertyType;
+    my $svgListPropertyType;
+    my $svgNativeType;
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $implType =~ /SVG/;
+    
+    $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implType);
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
+
+    # Append space to avoid compilation errors when using  PassRefPtr<$svgNativeType>
+    $svgNativeType = "$svgNativeType ";
+
+    my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implType);
+    if ($svgNativeType =~ /SVGPropertyTearOff/) {
+        $svgPropertyType = $svgWrappedNativeType;
+        $headerIncludes{"$svgWrappedNativeType.h"} = 1;
+        $headerIncludes{"SVGPropertyTearOff.h"} = 1;
+    } elsif ($svgNativeType =~ /SVGListPropertyTearOff/) {
+        $svgListPropertyType = $svgWrappedNativeType;
+        $headerIncludes{"$svgWrappedNativeType.h"} = 1;
+        $headerIncludes{"SVGListPropertyTearOff.h"} = 1;
+    }
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
 }
 
@@ -2650 +2659 @@
         # Default, include header with same name.
         $implIncludes{"JS$type.h"} = 1;
-        $implIncludes{"$type.h"} = 1;
+        $implIncludes{"$type.h"} = 1 if not $codeGenerator->AvoidInclusionOfType($type);
     }
 
@@ -2666 +2675 @@
     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)";
-        } else {
-            $value = "static_cast<SVGPropertyTearOff<$type>*>($value)";
-        }
+        $value = "static_cast<" . GetNativeType($type) . ">($value)";
     } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($type) and not $implClassName =~ /List$/) {
-        $value = "SVGPropertyTearOff<$type>::create($value)";
+        $value = $codeGenerator->GetSVGTypeNeedingTearOff($type) . "::create($value)";
     }
 

trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -601 +601 @@
     }
 
-    if ($type eq "SVGRect") {
-        $implIncludes{"FloatRect.h"} = 1;
-        $implIncludes{"DOMSVGRectInternal.h"} = 1;
-        return;
-    }
-
     if ($type eq "SVGPoint") {
         $implIncludes{"FloatPoint.h"} = 1;
@@ -659 +653 @@
 
     # Default, include the same named file (the implementation) and the same name prefixed with "DOM". 
-    $implIncludes{"$type.h"} = 1;
+    $implIncludes{"$type.h"} = 1 if not $codeGenerator->AvoidInclusionOfType($type);
     $implIncludes{"DOM${type}Internal.h"} = 1;
+}
+
+sub GetSVGPropertyTypes
+{
+    my $implType = shift;
+
+    my $svgPropertyType;
+    my $svgListPropertyType;
+    my $svgNativeType;
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $implType =~ /SVG/;
+
+    $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implType);
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
+
+    # Append space to avoid compilation errors when using  PassRefPtr<$svgNativeType>
+    $svgNativeType = "WebCore::$svgNativeType ";
+    $svgNativeType =~ s/</\<WebCore::/;
+
+    my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implType);
+    if ($svgNativeType =~ /SVGPropertyTearOff/) {
+        $svgPropertyType = "WebCore::$svgWrappedNativeType";
+        $svgPropertyType =~ s/</\<WebCore::/;
+    } elsif ($svgNativeType =~ /SVGListPropertyTearOff/) {
+        $svgListPropertyType = "WebCore::$svgWrappedNativeType";
+        $svgListPropertyType =~ s/</\<WebCore::/;
+    }
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
 }
 
@@ -975 +998 @@
         # Generate internal interfaces
         my $podType = $dataNode->extendedAttributes->{"PODType"};
-        my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
-        my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};
         my $podTypeWithNamespace;
-        my $svgPropertyTypeWithNamespace;
-        my $svgListPropertyTypeWithNamespace;
         my $implClassName = GetImplClassName($interfaceName);
         my $implClassNameWithNamespace = "WebCore::" . $implClassName;
 
         my $implType = $implClassNameWithNamespace;
+        my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implClassName);
+        $implType = $svgNativeType if $svgNativeType;
+
         if ($podType) {
             $podTypeWithNamespace = ($podType eq "float") ? "$podType" : "WebCore::$podType";
-        } elsif ($svgPropertyType) {
-            $implType = "WebCore::SVGPropertyTearOff<$implType>";
-            $svgPropertyTypeWithNamespace = ($svgPropertyType eq "float") ? "$svgPropertyType" : "WebCore::$svgPropertyType";
-        } elsif ($svgListPropertyType) {
-            $implType = "WebCore::SVGListPropertyTearOff<$implType>";
-            $svgListPropertyTypeWithNamespace = "WebCore::$svgListPropertyType";
         }
  
@@ -1018 +1034 @@
             if ($podType and $podType ne "float") {
                 push(@internalHeaderContent, "    class $podType;\n");
-            } elsif ($svgPropertyType and $svgPropertyType ne "float") {
-                push(@internalHeaderContent, "    class $svgPropertyType;\n");
-            } elsif ($svgListPropertyType) {
-                push(@internalHeaderContent, "    class $svgListPropertyType;\n");
             } elsif ($interfaceName eq "Node") {
                 push(@internalHeaderContent, "    class EventTarget;\n    class Node;\n");
@@ -1073 +1085 @@
 
     my $podType = $dataNode->extendedAttributes->{"PODType"};
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};
     my $podTypeWithNamespace;
-    my $svgPropertyTypeWithNamespace;
-    my $svgListPropertyTypeWithNamespace;
     my $implType = $implClassNameWithNamespace;
+
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implClassName);
+    $implType = $svgNativeType if $svgNativeType;
 
     if ($podType) {
         $podTypeWithNamespace = ($podType eq "float") ? "$podType" : "WebCore::$podType";
-    } elsif ($svgPropertyType) {
-        $implType = "WebCore::SVGPropertyTearOff<$implType>";
-        $svgPropertyTypeWithNamespace = ($svgPropertyType eq "float") ? "$svgPropertyType" : "WebCore::$svgPropertyType";
-    } elsif ($svgListPropertyType) {
-        $implType = "WebCore::SVGListPropertyTearOff<$implType>";
-        $svgListPropertyTypeWithNamespace = "WebCore::$svgListPropertyType";
     }
 
@@ -1124 +1129 @@
     } else {
         if (!$podType) {
-            $implIncludes{"$implClassName.h"} = 1;
+            $implIncludes{"$implClassName.h"} = 1 if not $codeGenerator->AvoidInclusionOfType($implClassName);
         } else {
             $implIncludes{"$podType.h"} = 1 unless $podType eq "float";
@@ -1228 +1233 @@
             my $getterContentTail = ")";
 
-            my $svgAnimatedPropertyType = $dataNode->extendedAttributes->{"SVGAnimatedProperty"};
             if ($svgPropertyType) {
                 $getterContentHead = "$getterExpressionPrefix";
 
                 # TODO: Handle special case for DOMSVGLength. We do need Custom code support for this.
-                if ($svgPropertyType eq "SVGLength" and $attributeName eq "value") {
+                if ($svgPropertyType eq "WebCore::SVGLength" and $attributeName eq "value") {
                     $getterContentHead = "value(0 /* FIXME */";
                 }
@@ -1286 +1290 @@
             } elsif ($svgPropertyType) {
                 $getterContentHead = "IMPL->propertyReference().$getterContentHead";
-            } elsif ($svgAnimatedPropertyType) {
-                if ($idlType =~ /List$/) {
-                    $getterContentHead = "kit(static_cast<WebCore::SVGListPropertyTearOff<WebCore::$idlType>*>($getterContentHead)";
-                } else {
-                    $getterContentHead = "kit(static_cast<WebCore::SVGPropertyTearOff<WebCore::$idlType>*>($getterContentHead)";
-                }
+            } elsif ($codeGenerator->IsSVGNewStyleAnimatedType($implClassName)) {
+                my $idlTypeWithNamespace = "WebCore::" . $codeGenerator->GetSVGTypeNeedingTearOff($idlType);
+                $idlTypeWithNamespace =~ s/</\<WebCore::/;
+                $getterContentHead = "kit(static_cast<$idlTypeWithNamespace*>($getterContentHead)";
                 $getterContentTail .= ")";
             } elsif (IsProtocolType($idlType) and $idlType ne "EventTarget") {
@@ -1303 +1305 @@
                 $getterContentTail .= "->toString()";                
             } elsif (ConversionNeeded($attribute->signature->type)) {
-                $getterContentHead = "kit(WTF::getPtr($getterContentHead";
-                $getterContentTail .= "))";
+                if ($codeGenerator->IsSVGTypeNeedingTearOff($attribute->signature->type) and not $implClassName =~ /List$/) {
+                    my $idlType = $attribute->signature->type;
+                    my $idlTypeWithNamespace = "WebCore::" . $codeGenerator->GetSVGTypeNeedingTearOff($idlType);
+                    $idlTypeWithNamespace =~ s/</\<WebCore::/;
+                    $getterContentHead = "kit(WTF::getPtr(${idlTypeWithNamespace}::create($getterContentHead";
+                    $getterContentTail .= ")))";
+                } else {
+                    $getterContentHead = "kit(WTF::getPtr($getterContentHead";
+                    $getterContentTail .= "))";
+                }
             }
 
@@ -1370 +1380 @@
                 if ($svgPropertyType) {
                     $getterContentHead = "$getterExpressionPrefix";
-                    push(@implContent, "    $svgPropertyTypeWithNamespace& podImpl = IMPL->propertyReference();\n");
+                    push(@implContent, "    $svgPropertyType& podImpl = IMPL->propertyReference();\n");
                     my $ec = $hasSetterException ? ", ec" : "";
                     push(@implContent, "    $exceptionInit\n") if $hasSetterException;
@@ -1509 +1519 @@
             my $svgMatrixRotateFromVector = ($podType and $podType eq "AffineTransform" and $functionName eq "rotateFromVector");
             my $svgMatrixInverse = ($podType and $podType eq "AffineTransform" and $functionName eq "inverse");
-            my $svgLengthConvertToSpecifiedUnits = ($svgPropertyType and $svgPropertyType eq "SVGLength" and $functionName eq "convertToSpecifiedUnits");
+            my $svgLengthConvertToSpecifiedUnits = ($svgPropertyType and $svgPropertyType eq "WebCore::SVGLength" and $functionName eq "convertToSpecifiedUnits");
 
             push(@parameterNames, "ec") if $raisesExceptions and !($svgMatrixRotateFromVector || $svgMatrixInverse);
@@ -1525 +1535 @@
 
                 my $implGetter = GetObjCTypeGetter($paramName, $idlType);
-                my $idlTypeWithNamespace = ($idlType eq "float") ? "$idlType" : "WebCore::$idlType";
-
-                push(@functionContent, "    WebCore::SVGPropertyTearOff<$idlTypeWithNamespace>* ${paramName}Core = $implGetter;\n");
+                my $idlTypeWithNamespace = "WebCore::" . $codeGenerator->GetSVGTypeNeedingTearOff($idlType);
+                $idlTypeWithNamespace =~ s/</\<WebCore::/;
+
+                push(@functionContent, "    $idlTypeWithNamespace* ${paramName}Core = $implGetter;\n");
                 push(@functionContent, "    if (!${paramName}Core) {\n");
                 push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::TYPE_MISMATCH_ERR;\n");
@@ -1545 +1556 @@
 
             if ($svgPropertyType) {
-                push(@functionContent, "    $svgPropertyTypeWithNamespace& podImpl = IMPL->propertyReference();\n");
+                push(@functionContent, "    $svgPropertyType& podImpl = IMPL->propertyReference();\n");
                 $content = "podImpl.$content;\n    IMPL->commitChange()"; 
             } else {
@@ -1594 +1605 @@
                 if (ConversionNeeded($function->signature->type)) {
                     if ($codeGenerator->IsSVGTypeNeedingTearOff($function->signature->type) and not $implClassName =~ /List$/) {
-                        $content = "kit(WTF::getPtr(WebCore::SVGPropertyTearOff<WebCore::" . $function->signature->type . ">::create($content)))";
+                        my $idlType = $function->signature->type;
+                        my $idlTypeWithNamespace = "WebCore::" . $codeGenerator->GetSVGTypeNeedingTearOff($idlType);
+                        $idlTypeWithNamespace =~ s/</\<WebCore::/;
+                        $content = "kit(WTF::getPtr(${idlTypeWithNamespace}::create($content)))";
                     } elsif ($codeGenerator->IsPodType($function->signature->type)) {
                         $content = "kit($content)";

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -213 +213 @@
 }
 
+sub GetSVGPropertyTypes
+{
+    my $implType = shift;
+
+    my $svgPropertyType;
+    my $svgListPropertyType;
+    my $svgNativeType;
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $implType =~ /SVG/;
+
+    $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implType);
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType) if not $svgNativeType;
+
+    # Append space to avoid compilation errors when using  PassRefPtr<$svgNativeType>
+    $svgNativeType = "$svgNativeType ";
+
+    my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implType);
+    if ($svgNativeType =~ /SVGPropertyTearOff/) {
+        $svgPropertyType = $svgWrappedNativeType;
+        $implIncludes{"SVGPropertyTearOff.h"} = 1,
+    } elsif ($svgNativeType =~ /SVGListPropertyTearOff/) {
+        $svgListPropertyType = $svgWrappedNativeType;
+        $implIncludes{"SVGListPropertyTearOff.h"} = 1,
+    }
+
+    return ($svgPropertyType, $svgListPropertyType, $svgNativeType);
+}
+
 sub GenerateHeader
 {
@@ -230 +258 @@
     # - Add default header template
     push(@headerContent, GenerateHeaderContentHeader($dataNode));
-
-    # Get correct pass/store types respecting PODType flag
     my $podType = $dataNode->extendedAttributes->{"PODType"};
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};
 
     my %headerInclues = ();
     $headerIncludes{"$podType.h"} = 1 if $podType and ($podType ne "double" and $podType ne "float" and $podType ne "RGBA32");
-    $headerIncludes{"$svgPropertyType.h"} = 1 if $svgPropertyType and $svgPropertyType ne "float";
-    $headerIncludes{"$svgListPropertyType.h"} = 1 if $svgListPropertyType;
-    $headerIncludes{"SVGAnimatedProperty.h"} = 1 if $svgPropertyType or $svgListPropertyType;
     $headerIncludes{"wtf/text/StringHash.h"} = 1;
     $headerIncludes{"WrapperTypeInfo.h"} = 1;
     $headerIncludes{"V8DOMWrapper.h"} = 1;
+
     my $headerClassInclude = GetHeaderClassInclude($implClassName);
     $headerIncludes{$headerClassInclude} = 1 if $headerClassInclude ne "";
+
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implClassName);
 
     foreach my $headerInclude (sort keys(%headerIncludes)) {
@@ -686 +710 @@
     my $nativeType = GetNativeTypeFromSignature($attribute->signature, -1);
     my $isPodType = IsPodType($implClassName);
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};
     my $skipContext = 0;
 
@@ -694 +716 @@
         $implIncludes{"V8SVGPODTypeWrapper.h"} = 1;
     }
-
-    $implIncludes{"SVGPropertyTearOff.h"} = 1 if $svgPropertyType;;
-    $implIncludes{"SVGListPropertyTearOff.h"} = 1 if $svgListPropertyType;
 
     # Special case: SVGZoomEvent's attributes are all read-only
@@ -704 +723 @@
     }
 
-    # Special case: SVGSVGEelement::viewport is read-only
-    if (($implClassName eq "SVGSVGElement") and ($attrName eq "viewport")) {
-        $attrIsPodType = 0;
-        $skipContext = 1;
-    }
-
     # Special case for SVGColor
     if (($implClassName eq "SVGColor") and ($attrName eq "rgbColor")) {
@@ -716 +729 @@
 
     my $getterStringUsesImp = $implClassName ne "float";
+    my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implClassName);
 
     # Getter
@@ -737 +751 @@
 END
         }
-
-    } elsif ($svgPropertyType) {
-        push(@implContentDecls, <<END);
-    SVGPropertyTearOff<$svgPropertyType>* wrapper = V8${implClassName}::toNative(info.Holder());
-    $svgPropertyType& impInstance = wrapper->propertyReference();
-    $svgPropertyType* imp = &impInstance;
-END
-    } elsif ($svgListPropertyType) {
-        push(@implContentDecls, <<END);
-    SVGListPropertyTearOff<$svgListPropertyType>* imp = V8${implClassName}::toNative(info.Holder());
-END
-    }  elsif ($attrExt->{"v8OnProto"} || $attrExt->{"V8DisallowShadowing"}) {
+    } elsif ($svgNativeType) {
+        my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implClassName);
+        if ($svgWrappedNativeType =~ /List$/) {
+            push(@implContentDecls, <<END);
+    $svgNativeType* imp = V8${implClassName}::toNative(info.Holder());
+END
+        } else {
+            push(@implContentDecls, <<END);
+    $svgNativeType* wrapper = V8${implClassName}::toNative(info.Holder());
+    $svgWrappedNativeType& impInstance = wrapper->propertyReference();
+    $svgWrappedNativeType* imp = &impInstance;
+END
+        }
+    } elsif ($attrExt->{"v8OnProto"} || $attrExt->{"V8DisallowShadowing"}) {
         if ($interfaceName eq "DOMWindow") {
             push(@implContentDecls, <<END);
@@ -905 +921 @@
 
     if ($codeGenerator->IsSVGNewStyleAnimatedType($implClassName)) {
-        $implIncludes{"V8${attrType}.h"} = 1;
-        if ($implClassName =~ /List$/) {
-            push(@implContentDecls, "    return toV8(static_cast<SVGListPropertyTearOff<$attrType>*>($result));\n");
-         } else {
-            push(@implContentDecls, "    return toV8(static_cast<SVGPropertyTearOff<$attrType>*>($result));\n");
-         }
+        $implIncludes{"V8$attrType.h"} = 1;
+        my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
+        # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
+        push(@implContentDecls, "    return toV8(static_cast<$svgNativeType*>($result));\n");
+    } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($attrType) and not $implClassName =~ /List$/) {
+        $implIncludes{"V8$attrType.h"} = 1;
+        my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
+        push(@implContentDecls, "    return toV8(WTF::getPtr(${svgNativeType}::create($result)));\n");
     } elsif ($attrIsPodType) {
         $implIncludes{"V8${attrType}.h"} = 1;
@@ -962 +980 @@
 
     my $isPodType = IsPodType($implClassName);
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"};
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"};
+    my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implClassName);
 
     if ($isPodType) {
@@ -971 +988 @@
         push(@implContentDecls, "    $implClassName impInstance = *wrapper;\n");
         push(@implContentDecls, "    $implClassName* imp = &impInstance;\n");
-    } elsif ($svgPropertyType) {
-        push(@implContentDecls, <<END);
-    SVGPropertyTearOff<$svgPropertyType>* wrapper = V8${implClassName}::toNative(info.Holder());
-    $svgPropertyType& impInstance = wrapper->propertyReference();
-    $svgPropertyType* imp = &impInstance;
-END
-    } elsif ($svgListPropertyType) {
-        push(@implContentDecls, <<END);
-    SVGListPropertyTearOff<$svgListPropertyType>* imp = V8${implClassName}::toNative(info.Holder());
-END
+    } elsif ($svgNativeType) {
+        my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implClassName);
+        if ($svgWrappedNativeType =~ /List$/) {
+            push(@implContentDecls, <<END);
+    $svgNativeType* imp = V8${implClassName}::toNative(info.Holder());
+END
+        } else {
+            push(@implContentDecls, <<END);
+    $svgNativeType* wrapper = V8${implClassName}::toNative(info.Holder());
+    $svgWrappedNativeType& impInstance = wrapper->propertyReference();
+    $svgWrappedNativeType* imp = &impInstance;
+END
+        }
     } elsif ($attrExt->{"v8OnProto"}) {
       if ($interfaceName eq "DOMWindow") {
@@ -1074 +1094 @@
     if ($isPodType) {
         push(@implContentDecls, "    wrapper->commitChange(*imp, V8Proxy::svgContext(wrapper));\n");
-    } elsif ($svgPropertyType) {
+    } elsif ($svgNativeType) {
         if ($useExceptions) {
             push(@implContentDecls, "    if (!ec)\n");
@@ -1281 +1301 @@
     }
 
-    my $svgPropertyType = $dataNode->extendedAttributes->{"SVGProperty"}; 
-    my $svgListPropertyType = $dataNode->extendedAttributes->{"SVGListProperty"}; 
+    my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($implClassName);
 
     if (IsPodType($implClassName)) {
@@ -1289 +1308 @@
         push(@implContentDecls, "    $nativeClassName impInstance = *impWrapper;\n");
         push(@implContentDecls, "    $nativeClassName* imp = &impInstance;\n");
-    } elsif ($svgPropertyType) {
-        my $nativeClassName = GetNativeType($implClassName);
-        push(@implContentDecls, "    $nativeClassName wrapper = V8${svgPropertyType}::toNative(args.Holder());\n");
-        push(@implContentDecls, "    $svgPropertyType& impInstance = wrapper->propertyReference();\n");
-        push(@implContentDecls, "    $svgPropertyType* imp = &impInstance;\n");
-    } elsif ($svgListPropertyType) {
-        my $nativeClassName = GetNativeType($implClassName);
-        push(@implContentDecls, "    $nativeClassName imp = V8${svgListPropertyType}::toNative(args.Holder());\n");
+    } elsif ($svgNativeType) {
+        my $nativeClassName = GetNativeType($implClassName); 
+        if ($implClassName =~ /List$/) {
+            push(@implContentDecls, "    $nativeClassName imp = V8${svgListPropertyType}::toNative(args.Holder());\n");
+        } else {
+            my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implClassName);
+            push(@implContentDecls, "    $nativeClassName wrapper = V8${svgPropertyType}::toNative(args.Holder());\n");
+            push(@implContentDecls, "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n");
+            push(@implContentDecls, "    $svgWrappedNativeType* imp = &impInstance;\n");
+        }
     } elsif (!$function->signature->extendedAttributes->{"ClassMethod"}) {
         push(@implContentDecls, <<END);
@@ -2646 +2667 @@
     my $type = shift;
 
-    $type = "FloatRect" if $type eq "SVGRect";
     $type = "FloatPoint" if $type eq "SVGPoint";
     $type = "AffineTransform" if $type eq "SVGMatrix";
     $type = "float" if $type eq "SVGNumber";
     $type = "V8SVGPODTypeWrapper<$type>" if $dataNode->extendedAttributes->{"PODType"};
-    $type = "SVGPropertyTearOff<$type>" if $dataNode->extendedAttributes->{"SVGProperty"};
-    $type = "SVGListPropertyTearOff<$type>" if $dataNode->extendedAttributes->{"SVGListProperty"};
+    $type = $codeGenerator->GetSVGTypeNeedingTearOff($type) if $codeGenerator->IsSVGTypeNeedingTearOff($type); 
     return $type;
 }
@@ -2669 +2688 @@
     my $nativeReturnType = GetNativeType($returnType, 0);
     my $result = "";
+
+    my $isSVGTearOffType = ($codeGenerator->IsSVGTypeNeedingTearOff($returnType) and not $implClassName =~ /List$/);
+    $nativeReturnType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($returnType) if $isSVGTearOffType;
 
     # Special case: SVG matrix transform methods should not mutate
@@ -2817 +2839 @@
     }
 
-    if ($codeGenerator->IsSVGTypeNeedingTearOff($returnType) and not $implClassName =~ /List$/) {
+    if ($isSVGTearOffType) {
         $implIncludes{"V8$returnType.h"} = 1;
         $implIncludes{"SVGPropertyTearOff.h"} = 1;
-        return $indent . "return toV8(WTF::getPtr(SVGPropertyTearOff<$returnType>::create($return)));\n";
+        my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($returnType);
+        $result .= $indent . "return toV8(WTF::getPtr(${svgNativeType}::create($return)));\n";
+        return $result;
     }
 
@@ -2848 +2872 @@
 
         $result .= $indent . "impWrapper->commitChange(impInstance, context);\n";
-    } elsif ($dataNode->extendedAttributes->{"SVGProperty"}) {
+    } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($implClassName) and not $implClassName =~ /List$/) {
         $result .= $indent . "wrapper->commitChange();\n";
     }
@@ -2924 +2948 @@
     my $isParameter = shift;
 
+    my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
+    if ($svgNativeType) {
+        if ($svgNativeType =~ /List$/) {
+            return "${svgNativeType}*";
+        } else {
+            return "RefPtr<${svgNativeType} >";
+        }
+    }
+
     if ($type eq "float" or $type eq "double") {
         return $type;
@@ -2938 +2971 @@
     return "String" if $type eq "DOMString";
     return "Range::CompareHow" if $type eq "CompareHow";
-    return "FloatRect" if $type eq "SVGRect";
     return "FloatPoint" if $type eq "SVGPoint";
     return "AffineTransform" if $type eq "SVGMatrix";
     return "SVGTransform" if $type eq "SVGTransform";
-    return "RefPtr<SVGPropertyTearOff<SVGAngle> >" if $type eq "SVGAngle";
-    return "RefPtr<SVGPropertyTearOff<SVGLength> >" if $type eq "SVGLength";
-    return "SVGListPropertyTearOff<SVGLengthList>*" if $type eq "SVGLengthList";
     return "float" if $type eq "SVGNumber";
     return "SVGPreserveAspectRatio" if $type eq "SVGPreserveAspectRatio";
@@ -2999 +3028 @@
     return 1 if $type eq "SVGPoint";
     return 1 if $type eq "SVGPreserveAspectRatio";
-    return 1 if $type eq "SVGRect";
     return 1 if $type eq "SVGTransform";
     return 0;
@@ -3380 +3408 @@
     my $implClassName = shift;
 
+    return 0 unless $implClassName =~ /SVG/;
+    return 0 if $implClassName =~ /Element/;
     return 0 if $codeGenerator->IsSVGNewStyleAnimatedType($implClassName);
-    if ($implClassName =~ /SVG/ and not $implClassName =~ /Element/) {
-        return 1 unless $implClassName =~ /SVGAngle/
-                     or $implClassName =~ /SVGPaint/
-                     or $implClassName =~ /SVGColor/
-                     or $implClassName =~ /SVGDocument/
-                     or $implClassName =~ /SVGLength/
-                     or $implClassName =~ /SVGLengthList/;
-    }
-
-    return 0;
+    return 0 if $codeGenerator->IsSVGTypeNeedingTearOff($implClassName);
+
+    my @noContextNeeded = ("SVGColor", "SVGDocument", "SVGPaintType", "SVGPaint", "SVGZoomEvent");
+    foreach (@noContextNeeded) {
+        return 0 if $implClassName eq $_;
+    }
+    return 1;
 }
 

trunk/WebCore/svg/DeprecatedSVGAnimatedPropertyTraits.h

@@ -106 +106 @@
 };
 
-// SVGAnimatedRect
-template<>
-struct DeprecatedSVGAnimatedPropertyTraits<FloatRect> : public Noncopyable {
-    typedef const FloatRect& PassType;
-    typedef FloatRect ReturnType;
-    typedef FloatRect StoredType;
-
-    static ReturnType null() { return FloatRect(); }
-    static ReturnType toReturnType(const StoredType& type) { return type; }
-    static String toString(PassType type) { return String::format("%f %f %f %f", type.x(), type.y(), type.width(), type.height()); }
-};
-
 // SVGAnimatedString
 template<>

trunk/WebCore/svg/DeprecatedSVGAnimatedTemplate.h

@@ -161 +161 @@
     typedef DeprecatedSVGAnimatedTemplate<SVGNumberList*> SVGAnimatedNumberList; 
     typedef DeprecatedSVGAnimatedTemplate<SVGPreserveAspectRatio> SVGAnimatedPreserveAspectRatio;
-    typedef DeprecatedSVGAnimatedTemplate<FloatRect> SVGAnimatedRect;
     typedef DeprecatedSVGAnimatedTemplate<String> SVGAnimatedString;
     typedef DeprecatedSVGAnimatedTemplate<SVGTransformList*> SVGAnimatedTransformList;

trunk/WebCore/svg/SVGAngle.idl

@@ -23 +23 @@
 module svg {
 
-    interface [Conditional=SVG, SVGProperty=SVGAngle] SVGAngle { 
+    interface [Conditional=SVG] SVGAngle { 
         // Angle Unit Types
         const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;

trunk/WebCore/svg/SVGAnimatedAngle.idl

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

trunk/WebCore/svg/SVGAnimatedLength.idl

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

trunk/WebCore/svg/SVGAnimatedLengthList.idl

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

trunk/WebCore/svg/SVGFitToViewBox.h

@@ -40 +40 @@
     bool isKnownAttribute(const QualifiedName&);
 
-    virtual void setViewBoxBaseValue(DeprecatedSVGAnimatedPropertyTraits<FloatRect>::PassType) = 0;
+    virtual void setViewBoxBaseValue(const FloatRect&) = 0;
     virtual void setPreserveAspectRatioBaseValue(DeprecatedSVGAnimatedPropertyTraits<SVGPreserveAspectRatio>::PassType) = 0;
 

trunk/WebCore/svg/SVGLength.idl

@@ -23 +23 @@
 module svg {
 
-    interface [Conditional=SVG, SVGProperty=SVGLength] SVGLength { 
+    interface [Conditional=SVG] SVGLength { 
         // Length Unit Types
         const unsigned short SVG_LENGTHTYPE_UNKNOWN    = 0;

trunk/WebCore/svg/SVGMarkerElement.h

@@ -89 +89 @@
 
     // SVGFitToViewBox
-    DECLARE_ANIMATED_PROPERTY(SVGMarkerElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+    DECLARE_ANIMATED_PROPERTY_NEW(SVGMarkerElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
     DECLARE_ANIMATED_PROPERTY(SVGMarkerElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio)
 };

trunk/WebCore/svg/SVGPatternElement.h

@@ -80 +80 @@
 
         // SVGPatternElement
-        DECLARE_ANIMATED_PROPERTY(SVGPatternElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGPatternElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
         DECLARE_ANIMATED_PROPERTY(SVGPatternElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio) 
     };

trunk/WebCore/svg/SVGRect.idl

@@ -23 +23 @@
 module svg {
 
-    interface [Conditional=SVG, PODType=FloatRect] SVGRect {
-        attribute float x;
-        attribute float y;
-        attribute float width;
-        attribute float height;
+    interface [Conditional=SVG] SVGRect {
+        attribute [StrictTypeChecking] float x;
+        attribute [StrictTypeChecking] float y;
+        attribute [StrictTypeChecking] float width;
+        attribute [StrictTypeChecking] float height;
     };
 

trunk/WebCore/svg/SVGSVGElement.cpp

@@ -187 +187 @@
 {
     if (!m_viewSpec)
-        m_viewSpec = adoptPtr(new SVGViewSpec(this));
+        m_viewSpec = adoptPtr(new SVGViewSpec(const_cast<SVGSVGElement*>(this)));
     return m_viewSpec.get();
 }
@@ -581 +581 @@
     setUseCurrentView(true);
     if (viewElement->hasAttribute(SVGNames::viewBoxAttr))
-        currentView()->setViewBox(viewElement->viewBox());
+        currentView()->setViewBoxBaseValue(viewElement->viewBox());
     else
-        currentView()->setViewBox(viewBox());
+        currentView()->setViewBoxBaseValue(viewBox());
 
     SVGPreserveAspectRatio aspectRatio;

trunk/WebCore/svg/SVGSVGElement.h

@@ -147 +147 @@
 
         // SVGFitToViewBox
-        DECLARE_ANIMATED_PROPERTY(SVGSVGElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGSVGElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
         DECLARE_ANIMATED_PROPERTY(SVGSVGElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio)
  

trunk/WebCore/svg/SVGSVGElement.idl

@@ -42 +42 @@
                  attribute DOMString contentStyleType
                      /*setter raises(DOMException)*/;
-        readonly attribute [Immutable] SVGRect viewport;
+        readonly attribute SVGRect viewport;
         readonly attribute float pixelUnitToMillimeterX;
         readonly attribute float pixelUnitToMillimeterY;
@@ -49 +49 @@
                  attribute boolean useCurrentView
                      /*setter raises(DOMException)*/;
-        // TODO    readonly attribute [Immutable] SVGViewSpec currentView;
+        // TODO    readonly attribute SVGViewSpec currentView;
                  attribute float currentScale
                      /*setter raises(DOMException)*/;

trunk/WebCore/svg/SVGSymbolElement.h

@@ -23 +23 @@
 
 #if ENABLE(SVG)
+#include "SVGAnimatedPropertyMacros.h"
 #include "SVGExternalResourcesRequired.h"
 #include "SVGFitToViewBox.h"
@@ -51 +52 @@
  
         // SVGFitToViewBox
-        DECLARE_ANIMATED_PROPERTY(SVGSymbolElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGSymbolElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
         DECLARE_ANIMATED_PROPERTY(SVGSymbolElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio) 
     };

trunk/WebCore/svg/SVGViewElement.h

@@ -23 +23 @@
 
 #if ENABLE(SVG)
+#include "SVGAnimatedPropertyMacros.h"
 #include "SVGStyledElement.h"
 #include "SVGExternalResourcesRequired.h"
@@ -52 +53 @@
  
         // SVGFitToViewBox
-        DECLARE_ANIMATED_PROPERTY(SVGViewElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGViewElement, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
         DECLARE_ANIMATED_PROPERTY(SVGViewElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio)
  

trunk/WebCore/svg/SVGViewSpec.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-SVGViewSpec::SVGViewSpec(const SVGSVGElement* contextElement)
+SVGViewSpec::SVGViewSpec(SVGElement* contextElement)
     : m_contextElement(contextElement)
     , m_transform(SVGTransformList::create(SVGNames::transformAttr))

trunk/WebCore/svg/SVGViewSpec.h

@@ -22 +22 @@
 
 #if ENABLE(SVG)
+#include "SVGAnimatedPropertyMacros.h"
+#include "SVGElement.h"
 #include "SVGFitToViewBox.h"
 #include "SVGZoomAndPan.h"
@@ -30 +32 @@
 
     class SVGElement;
-    class SVGSVGElement;
     class SVGTransformList;
 
@@ -37 +38 @@
                         public Noncopyable {
     public:
-        SVGViewSpec(const SVGSVGElement*);
+        SVGViewSpec(SVGElement*);
 
         bool parseViewSpec(const String&);
@@ -52 +53 @@
         SVGElement* viewTarget() const;
 
-        SVGSVGElement* contextElement() const { return const_cast<SVGSVGElement*>(m_contextElement); }
+        SVGElement* contextElement() const { return const_cast<SVGElement*>(m_contextElement); }
 
     private:
-        const SVGSVGElement* m_contextElement;
+        SVGElement* m_contextElement;
 
         // SVGFitToViewBox
-        DECLARE_ANIMATED_PROPERTY(SVGViewSpec, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGViewSpec, SVGNames::viewBoxAttr, FloatRect, ViewBox, viewBox)
         DECLARE_ANIMATED_PROPERTY(SVGViewSpec, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio)
 

trunk/WebCore/svg/SVGZoomEvent.idl

@@ -27 +27 @@
 
     interface [Conditional=SVG] SVGZoomEvent : UIEvent { 
-        readonly attribute [Immutable] SVGRect zoomRectScreen;
+        readonly attribute SVGRect zoomRectScreen;
         readonly attribute float previousScale;
         readonly attribute [Immutable] SVGPoint previousTranslate;

trunk/WebCore/svg/properties/SVGAnimatedPropertyMacros.h

@@ -74 +74 @@
 { \
     m_##LowerProperty.value = type; \
-    invalidateSVGAttributes(); \
+    SVGElement* contextElement = GetOwnerElementForType<OwnerType, IsDerivedFromSVGElement<OwnerType>::value>::ownerElement(this); \
+    contextElement->invalidateSVGAttributes(); \
 } \
 \
@@ -82 +83 @@
          return; \
     AtomicString value(SVGPropertyTraits<PropertyType>::toString(LowerProperty##BaseValue())); \
-    SVGAnimatedPropertySynchronizer<IsDerivedFromSVGElement<OwnerType>::value>::synchronize(this, DOMAttribute, value); \
+    SVGElement* contextElement = GetOwnerElementForType<OwnerType, IsDerivedFromSVGElement<OwnerType>::value>::ownerElement(this); \
+    SVGAnimatedPropertySynchronizer<IsDerivedFromSVGElement<OwnerType>::value>::synchronize(contextElement, DOMAttribute, value); \
 } \
 \
@@ -88 +90 @@
 { \
     m_##LowerProperty.shouldSynchronize = true; \
-    return SVGAnimatedProperty::lookupOrCreateWrapper<TearOffType, PropertyType>(this, DOMAttribute, SVGDOMAttributeIdentifier, m_##LowerProperty.value); \
+    SVGElement* contextElement = GetOwnerElementForType<OwnerType, IsDerivedFromSVGElement<OwnerType>::value>::ownerElement(this); \
+    return SVGAnimatedProperty::lookupOrCreateWrapper<TearOffType, PropertyType>(contextElement, DOMAttribute, SVGDOMAttributeIdentifier, m_##LowerProperty.value); \
 } \
 private: \
@@ -104 +107 @@
 void detachAnimated##UpperProperty##ListWrappers(unsigned newListSize) \
 { \
-    SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGAnimatedListPropertyTearOff<PropertyType> >(this, DOMAttribute.localName()); \
+    SVGElement* contextElement = GetOwnerElementForType<OwnerType, IsDerivedFromSVGElement<OwnerType>::value>::ownerElement(this); \
+    SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGAnimatedListPropertyTearOff<PropertyType> >(contextElement, DOMAttribute.localName()); \
     if (!wrapper) \
         return; \