Changeset 118735 in webkit

Timestamp:

May 29, 2012 1:41:58 AM (12 years ago)

Author:

Nikolas Zimmermann

Message:

SVGViewSpec DOM bindings aka SVGSVGElement.currentView is unimplemented
​https://bugs.webkit.org/show_bug.cgi?id=15495

Reviewed by Rob Buis.

Source/WebCore:

Finish SVGViewSpec implementation and expose it to the Web. Numerous smaller bugs are fixed:

• SVGViewSpec and all of its contents should be read-only. Enforce that and test it. Add a new enum to SVGPropertyInfo so that each SVGAnimatedProperty knows if its content is supposed to be read-write or read-only.
• Make the 'transform' attribute of SVGViewSpec exposable by switching to a SVGTransformListProperty - it can now be accessed from JS.
• Assure that following XXXString methods are in sync with the corresponding SVG DOM interfaces

readonly attribute DOMString viewBoxString;
readonly attribute DOMString preserveAspectRatioString;
readonly attribute DOMString transformString;
readonly attribute DOMString viewTargetString;

• Cleanup code in svg/properties that was intended to handle SVGViewSpec. Turns out lot of the complexity was unncessary, and can be removed.
• Move SVGFitToViewBox to the same pattern SVGZoomAndPan uses since two days, that avoids any virtual function calls for attribute parsing.
• Create/expose ObjectiveC/JS bindings for SVGViewSpec.
• Enable SVGViewSpec constructor.

Tests: svg/custom/linking-a-03-b-all-expected.svg

svg/dom/SVGViewSpec-defaults.html
svg/dom/SVGViewSpec.html
svg/dom/complex-svgView-specification.html
svg/dom/viewspec-parser.html

• CMakeLists.txt:
• DerivedSources.cpp:
• DerivedSources.make:
• DerivedSources.pri:
• GNUmakefile.list.am:
• Target.pri:
• WebCore.gyp/WebCore.gyp:
• WebCore.gypi:
• WebCore.order:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSSVGLengthCustom.cpp:

(WebCore::JSSVGLength::setValue):
(WebCore::JSSVGLength::convertToSpecifiedUnits):

• bindings/objc/DOMSVG.h:
• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):
(NativeToJSValue):

• bindings/scripts/CodeGeneratorObjC.pm:

(GenerateImplementation):

• bindings/scripts/CodeGeneratorV8.pm:

(GenerateNormalAttrGetter):
(GenerateNormalAttrSetter):
(GenerateFunctionCallback):

• bindings/v8/custom/V8SVGLengthCustom.cpp:

(WebCore::V8SVGLength::valueAccessorSetter):
(WebCore::V8SVGLength::convertToSpecifiedUnitsCallback):

• page/DOMWindow.idl:
• rendering/svg/RenderSVGResourcePattern.cpp:

(WebCore::RenderSVGResourcePattern::buildTileImageTransform):

• svg/SVGFitToViewBox.cpp:
• svg/SVGFitToViewBox.h:

(SVGFitToViewBox):
(WebCore::SVGFitToViewBox::parseAttribute):

• svg/SVGMarkerElement.cpp:

(WebCore::SVGMarkerElement::orientTypePropertyInfo):
(WebCore::SVGMarkerElement::parseAttribute):
(WebCore::SVGMarkerElement::synchronizeOrientType):
(WebCore::SVGMarkerElement::lookupOrCreateOrientTypeWrapper):

• svg/SVGPathElement.cpp:

(WebCore::SVGPathElement::dPropertyInfo):
(WebCore::SVGPathElement::svgAttributeChanged):
(WebCore::SVGPathElement::pathByteStream):
(WebCore::SVGPathElement::lookupOrCreateDWrapper):
(WebCore::SVGPathElement::synchronizeD):

• svg/SVGPathSegWithContext.h:

(WebCore::SVGPathSegWithContext::animatedProperty):

• svg/SVGPatternElement.cpp:

(WebCore::SVGPatternElement::parseAttribute):

• svg/SVGPolyElement.cpp:

(WebCore::SVGPolyElement::pointsPropertyInfo):
(WebCore::SVGPolyElement::parseAttribute):
(WebCore::SVGPolyElement::synchronizePoints):
(WebCore::SVGPolyElement::lookupOrCreatePointsWrapper):

• svg/SVGRect.h:
• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::~SVGSVGElement):
(WebCore::SVGSVGElement::currentView):
(WebCore::SVGSVGElement::parseAttribute):
(WebCore::SVGSVGElement::currentViewBoxRect):
(WebCore::SVGSVGElement::viewBoxToViewTransform):
(WebCore::SVGSVGElement::setupInitialView):
(WebCore::SVGSVGElement::inheritViewAttributes):

• svg/SVGSVGElement.h:

(SVGSVGElement):

• svg/SVGSVGElement.idl:
• svg/SVGSymbolElement.cpp:

(WebCore::SVGSymbolElement::parseAttribute):

• svg/SVGTests.cpp:

(WebCore::SVGTests::requiredFeaturesPropertyInfo):
(WebCore::SVGTests::requiredExtensionsPropertyInfo):
(WebCore::SVGTests::systemLanguagePropertyInfo):
(WebCore::SVGTests::synchronizeRequiredFeatures):
(WebCore::SVGTests::synchronizeRequiredExtensions):
(WebCore::SVGTests::synchronizeSystemLanguage):

• svg/SVGTextContentElement.cpp:

(WebCore::SVGTextContentElement::textLengthPropertyInfo):
(WebCore::SVGTextContentElement::synchronizeTextLength):
(WebCore::SVGTextContentElement::lookupOrCreateTextLengthWrapper):

• svg/SVGViewElement.cpp:

(WebCore::SVGViewElement::parseAttribute):

• svg/SVGViewElement.h:
• svg/SVGViewSpec.cpp:

(WebCore::SVGViewSpec::viewBoxPropertyInfo):
(WebCore::SVGViewSpec::preserveAspectRatioPropertyInfo):
(WebCore::SVGViewSpec::transformPropertyInfo):
(WebCore::SVGViewSpec::SVGViewSpec):
(WebCore::SVGViewSpec::viewBoxIdentifier):
(WebCore::SVGViewSpec::preserveAspectRatioIdentifier):
(WebCore::SVGViewSpec::transformIdentifier):
(WebCore::SVGViewSpec::setZoomAndPan):
(WebCore::SVGViewSpec::setTransformString):
(WebCore::SVGViewSpec::transformString):
(WebCore::SVGViewSpec::viewBoxString):
(WebCore::SVGViewSpec::preserveAspectRatioString):
(WebCore::SVGViewSpec::viewTarget):
(WebCore::SVGViewSpec::transform):
(WebCore::SVGViewSpec::lookupOrCreateViewBoxWrapper):
(WebCore::SVGViewSpec::lookupOrCreatePreserveAspectRatioWrapper):
(WebCore::SVGViewSpec::lookupOrCreateTransformWrapper):
(WebCore::SVGViewSpec::reset):
(WebCore::SVGViewSpec::parseViewSpec):

• svg/SVGViewSpec.h:

(WebCore::SVGViewSpec::~SVGViewSpec):
(SVGViewSpec):
(WebCore::SVGViewSpec::create):
(WebCore::SVGViewSpec::setViewTargetString):
(WebCore::SVGViewSpec::setZoomAndPan):
(WebCore::SVGViewSpec::contextElement):
(WebCore::SVGViewSpec::resetContextElement):
(WebCore::SVGViewSpec::transformBaseValue):
(WebCore::SVGViewSpec::viewBoxAnimated):
(WebCore::SVGViewSpec::viewBox):
(WebCore::SVGViewSpec::viewBoxBaseValue):
(WebCore::SVGViewSpec::setViewBoxBaseValue):
(WebCore::SVGViewSpec::preserveAspectRatioAnimated):
(WebCore::SVGViewSpec::preserveAspectRatio):
(WebCore::SVGViewSpec::preserveAspectRatioBaseValue):
(WebCore::SVGViewSpec::setPreserveAspectRatioBaseValue):

• svg/SVGViewSpec.idl:
• svg/properties/SVGAnimatedProperty.h:

(WebCore::SVGAnimatedProperty::isReadOnly):
(WebCore::SVGAnimatedProperty::setIsReadOnly):
(SVGAnimatedProperty):
(WebCore::SVGAnimatedProperty::lookupOrCreateWrapper):
(WebCore::SVGAnimatedProperty::lookupWrapper):
(WebCore::SVGAnimatedProperty::SVGAnimatedProperty):

• svg/properties/SVGAnimatedPropertyMacros.h:

(WebCore::SVGSynchronizableAnimatedProperty::synchronize):
(SVGSynchronizableAnimatedProperty):

• svg/properties/SVGAnimatedPropertySynchronizer.h: Removed.
• svg/properties/SVGAttributeToPropertyMap.h:
• svg/properties/SVGListProperty.h:
• svg/properties/SVGListPropertyTearOff.h:

(SVGListPropertyTearOff):
(WebCore::SVGListPropertyTearOff::isReadOnly):

• svg/properties/SVGPathSegListPropertyTearOff.h:

(SVGPathSegListPropertyTearOff):
(WebCore::SVGPathSegListPropertyTearOff::isReadOnly):

• svg/properties/SVGProperty.h:

(SVGProperty):

• svg/properties/SVGPropertyInfo.h:

(WebCore::SVGPropertyInfo::SVGPropertyInfo):
(SVGPropertyInfo):

• svg/properties/SVGPropertyTearOff.h:

(WebCore::SVGPropertyTearOff::isReadOnly):

• svg/properties/SVGStaticListPropertyTearOff.h:

(SVGStaticListPropertyTearOff):
(WebCore::SVGStaticListPropertyTearOff::isReadOnly):

Source/WebKit/mac:

• MigrateHeaders.make: Copy DOMSVGViewSpec*.h headers.

LayoutTests:

Re-enable a long disabled test for SVGViewSpec, and make it actually work.
Extend SVGViewSpec test coverage, and rebaseline results that changed due the SVGViewSpec constructor addition.

Make linking-a-03-b-all.svg a reftest, to avoid rebaselines on all platforms.

• platform/chromium-linux/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/chromium-mac/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/chromium-win/fast/js/global-constructors-expected.txt:
• platform/chromium-win/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/chromium-win/svg/custom/linking-a-03-b-all-expected.txt: Removed.
• platform/gtk/fast/js/global-constructors-expected.txt:
• platform/gtk/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/gtk/svg/custom/linking-a-03-b-all-expected.txt: Removed.
• platform/mac/fast/js/global-constructors-expected.txt:
• platform/mac/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/mac/svg/custom/linking-a-03-b-all-expected.txt: Removed.
• platform/qt/fast/js/global-constructors-expected.txt:
• platform/qt/svg/custom/linking-a-03-b-all-expected.png: Removed.
• platform/qt/svg/custom/linking-a-03-b-all-expected.txt: Removed.
• platform/win/fast/js/global-constructors-expected.txt:
• svg/custom/global-constructors-expected.txt:
• svg/custom/linking-a-03-b-all-expected.svg: Added.
• svg/dom/SVGViewSpec-defaults-expected.txt: Added.
• svg/dom/SVGViewSpec-defaults.html: Added.
• svg/dom/SVGViewSpec-expected.txt: Added.
• svg/dom/SVGViewSpec.html: Added.
• svg/dom/complex-svgView-specification-expected.html: Added.
• svg/dom/complex-svgView-specification.html: Added.
• svg/dom/resources/viewspec-target.svg: Added.
• svg/dom/script-tests/SVGViewSpec-defaults.js: Added.
• svg/dom/script-tests/SVGViewSpec.js: Added.

(completeTest.script.onload):
(completeTest):
(testFragment):
(matrixToString):
(continueTesting):

• svg/dom/viewspec-parser-expected.txt: Added.
• svg/dom/viewspec-parser.html: Renamed from LayoutTests/svg/dom/viewspec-parser.html-disabled.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/chromium-mac/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/chromium-win/fast/js/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/platform/chromium-win/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/chromium-win/svg/custom/linking-a-03-b-all-expected.txt (deleted)
• LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/platform/gtk/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/gtk/svg/custom/linking-a-03-b-all-expected.txt (deleted)
• LayoutTests/platform/mac/fast/js/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/mac/svg/custom/linking-a-03-b-all-expected.txt (deleted)
• LayoutTests/platform/qt/fast/js/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/platform/qt/svg/custom/linking-a-03-b-all-expected.png (deleted)
• LayoutTests/platform/qt/svg/custom/linking-a-03-b-all-expected.txt (deleted)
• LayoutTests/platform/win/fast/js/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/svg/custom/global-constructors-expected.txt (modified) (1 diff)
• LayoutTests/svg/custom/linking-a-03-b-all-expected.svg (added)
• LayoutTests/svg/dom/SVGViewSpec-defaults-expected.txt (added)
• LayoutTests/svg/dom/SVGViewSpec-defaults.html (added)
• LayoutTests/svg/dom/SVGViewSpec-expected.txt (added)
• LayoutTests/svg/dom/SVGViewSpec.html (added)
• LayoutTests/svg/dom/complex-svgView-specification-expected.html (added)
• LayoutTests/svg/dom/complex-svgView-specification.html (added)
• LayoutTests/svg/dom/resources/viewspec-target.svg (added)
• LayoutTests/svg/dom/script-tests/SVGViewSpec-defaults.js (added)
• LayoutTests/svg/dom/script-tests/SVGViewSpec.js (added)
• LayoutTests/svg/dom/viewspec-parser-expected.txt (added)
• LayoutTests/svg/dom/viewspec-parser.html (moved) (moved from trunk/LayoutTests/svg/dom/viewspec-parser.html-disabled) (8 diffs)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.cpp (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/DerivedSources.pri (modified) (1 diff)
• Source/WebCore/GNUmakefile.list.am (modified) (3 diffs)
• Source/WebCore/Target.pri (modified) (1 diff)
• Source/WebCore/WebCore.gyp/WebCore.gyp (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (3 diffs)
• Source/WebCore/WebCore.order (modified) (1 diff)
• Source/WebCore/WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (15 diffs)
• Source/WebCore/bindings/js/JSSVGLengthCustom.cpp (modified) (2 diffs)
• Source/WebCore/bindings/objc/DOMSVG.h (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (3 diffs)
• Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (3 diffs)
• Source/WebCore/bindings/v8/custom/V8SVGLengthCustom.cpp (modified) (2 diffs)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGFitToViewBox.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGFitToViewBox.h (modified) (2 diffs)
• Source/WebCore/svg/SVGMarkerElement.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGPathElement.cpp (modified) (6 diffs)
• Source/WebCore/svg/SVGPathSegWithContext.h (modified) (1 diff)
• Source/WebCore/svg/SVGPatternElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGPolyElement.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGRect.h (modified) (1 diff)
• Source/WebCore/svg/SVGSVGElement.cpp (modified) (10 diffs)
• Source/WebCore/svg/SVGSVGElement.h (modified) (2 diffs)
• Source/WebCore/svg/SVGSVGElement.idl (modified) (1 diff)
• Source/WebCore/svg/SVGSymbolElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGTests.cpp (modified) (6 diffs)
• Source/WebCore/svg/SVGTextContentElement.cpp (modified) (3 diffs)
• Source/WebCore/svg/SVGViewElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGViewElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGViewSpec.cpp (modified) (6 diffs)
• Source/WebCore/svg/SVGViewSpec.h (modified) (1 diff)
• Source/WebCore/svg/SVGViewSpec.idl (modified) (1 diff)
• Source/WebCore/svg/properties/SVGAnimatedProperty.h (modified) (4 diffs)
• Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h (modified) (8 diffs)
• Source/WebCore/svg/properties/SVGAnimatedPropertySynchronizer.h (deleted)
• Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h (modified) (2 diffs)
• Source/WebCore/svg/properties/SVGListProperty.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGListPropertyTearOff.h (modified) (2 diffs)
• Source/WebCore/svg/properties/SVGPathSegListPropertyTearOff.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGProperty.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGPropertyInfo.h (modified) (3 diffs)
• Source/WebCore/svg/properties/SVGPropertyTearOff.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGStaticListPropertyTearOff.h (modified) (2 diffs)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/MigrateHeaders.make (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-29  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        SVGViewSpec DOM bindings aka SVGSVGElement.currentView is unimplemented
+        https://bugs.webkit.org/show_bug.cgi?id=15495
+
+        Reviewed by Rob Buis.
+
+        Re-enable a long disabled test for SVGViewSpec, and make it actually work.
+        Extend SVGViewSpec test coverage, and rebaseline results that changed due the SVGViewSpec constructor addition.
+
+        Make linking-a-03-b-all.svg a reftest, to avoid rebaselines on all platforms.
+
+        * platform/chromium-linux/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/chromium-mac/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/chromium-win/fast/js/global-constructors-expected.txt:
+        * platform/chromium-win/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/chromium-win/svg/custom/linking-a-03-b-all-expected.txt: Removed.
+        * platform/gtk/fast/js/global-constructors-expected.txt:
+        * platform/gtk/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/gtk/svg/custom/linking-a-03-b-all-expected.txt: Removed.
+        * platform/mac/fast/js/global-constructors-expected.txt:
+        * platform/mac/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/mac/svg/custom/linking-a-03-b-all-expected.txt: Removed.
+        * platform/qt/fast/js/global-constructors-expected.txt:
+        * platform/qt/svg/custom/linking-a-03-b-all-expected.png: Removed.
+        * platform/qt/svg/custom/linking-a-03-b-all-expected.txt: Removed.
+        * platform/win/fast/js/global-constructors-expected.txt:
+        * svg/custom/global-constructors-expected.txt:
+        * svg/custom/linking-a-03-b-all-expected.svg: Added.
+        * svg/dom/SVGViewSpec-defaults-expected.txt: Added.
+        * svg/dom/SVGViewSpec-defaults.html: Added.
+        * svg/dom/SVGViewSpec-expected.txt: Added.
+        * svg/dom/SVGViewSpec.html: Added.
+        * svg/dom/complex-svgView-specification-expected.html: Added.
+        * svg/dom/complex-svgView-specification.html: Added.
+        * svg/dom/resources/viewspec-target.svg: Added.
+        * svg/dom/script-tests/SVGViewSpec-defaults.js: Added.
+        * svg/dom/script-tests/SVGViewSpec.js: Added.
+        (completeTest.script.onload):
+        (completeTest):
+        (testFragment):
+        (matrixToString):
+        (continueTesting):
+        * svg/dom/viewspec-parser-expected.txt: Added.
+        * svg/dom/viewspec-parser.html: Renamed from LayoutTests/svg/dom/viewspec-parser.html-disabled.
+
 2012-05-29  Marcus Bulach  <bulach@chromium.org>
 

trunk/LayoutTests/platform/chromium-win/fast/js/global-constructors-expected.txt

@@ -292 +292 @@
 PASS SVGVKernElement.toString() is '[object SVGVKernElementConstructor]'
 PASS SVGViewElement.toString() is '[object SVGViewElementConstructor]'
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
+PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
 PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'
 PASS SharedWorker.toString() is '[object SharedWorkerConstructor]'

trunk/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt

@@ -296 +296 @@
 PASS SVGVKernElement.toString() is '[object SVGVKernElementConstructor]'
 PASS SVGViewElement.toString() is '[object SVGViewElementConstructor]'
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
 PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
 PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'

trunk/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt

@@ -296 +296 @@
 PASS SVGVKernElement.toString() is '[object SVGVKernElementConstructor]'
 PASS SVGViewElement.toString() is '[object SVGViewElementConstructor]'
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
 PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
 PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'

trunk/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt

@@ -283 +283 @@
 PASS SVGUseElement.toString() is '[object SVGUseElementConstructor]'
 PASS SVGViewElement.toString() is '[object SVGViewElementConstructor]'
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
 PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
 PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'

trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt

@@ -292 +292 @@
 PASS SVGVKernElement.toString() is '[object SVGVKernElementConstructor]'
 PASS SVGViewElement.toString() is '[object SVGViewElementConstructor]'
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
+PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
 PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'
 PASS SharedWorker.toString() is '[object SharedWorkerConstructor]'

trunk/LayoutTests/svg/custom/global-constructors-expected.txt

@@ -33 +33 @@
 FAIL SVGFitToViewBox.toString() should be [object SVGFitToViewBoxConstructor]. Threw exception ReferenceError: Can't find variable: SVGFitToViewBox
 PASS SVGZoomAndPan.toString() is '[object SVGZoomAndPanConstructor]'
-FAIL SVGViewSpec.toString() should be [object SVGViewSpecConstructor]. Threw exception ReferenceError: Can't find variable: SVGViewSpec
+PASS SVGViewSpec.toString() is '[object SVGViewSpecConstructor]'
 FAIL SVGURIReference.toString() should be [object SVGURIReferenceConstructor]. Threw exception ReferenceError: Can't find variable: SVGURIReference
 FAIL SVGCSSRule.toString() should be [object SVGCSSRuleConstructor]. Threw exception ReferenceError: Can't find variable: SVGCSSRule

trunk/LayoutTests/svg/dom/viewspec-parser.html

@@ -17 +17 @@
         viewTarget: 1
     };
-    
+
     var preserveAspectRatioValues = [ "Min", "Max", "Mid" ];
-    
+
     var testsToRun = [
+      "svgView(viewBox(0,0,200,200)))",
+      "svgView(preserveAspectRatio(xMaxYMin slice))",
+      "svgView(preserveAspectRatio(xMaxYMin))",
+      "svgView(viewBox(1,2,3,4);preserveAspectRatio(xMaxYMin))",
+      "svgView(zoomAndPan(disable))",
+      "svgView(viewTarget(#myElementId))",
       "svgView",
       "svgView(",
       "svgView()",
       "svgView(" + String.fromCharCode(0),
-      "svgView(" + String.fromCharCode(0) + ")",
       "svgView(transform(scale(2));;)",
       "svgView(transform(scale(2));x", // used to hang
@@ -32 +37 @@
       "svgView(;;transform(scale(.5)))",
       "svgView(transform(scale(.5));transform(scale(2));transform(scale(2)))",
+
       ];
-    
-    
+
     var characters = [
         "0",
@@ -57 +62 @@
         ","
     ];
-    
+
     function buildTestsToRun() {
       for (var attribute in attributes) {
 
           // Too few / too many arguments
-          for (var i = 0; i < 20; i++) { //>
+          for (var i = 0; i < 5; i++) { //>
               var attributeString = "svgView(" + attribute + "(";
               for (var j = 0; j < i; j++) { //>
@@ -74 +79 @@
 
           // Random assortments of valid characters
-          for (var i = 0; i < 100; i++) { //>
+          for (var i = 0; i < 50; i++) { //>
               var attributeString = "svgView(" + attribute + "(";
               var count = Math.scriptedRandomInt(20);
@@ -82 +87 @@
               testsToRun.push(attributeString);
           }
-          
+
           // attribute names that are "off by one"
           var extraChar = attribute.charAt(attribute.length - 1);
           testsToRun.push("svgView(" + attribute + extraChar + "(0, 0)");
           testsToRun.push("svgView(" + attribute.substring(0, attribute.length - 1) + "(0, 0)");
-          
+
           // Empty-ish attributes
           testsToRun.push("svgView(" + attribute);
           testsToRun.push("svgView(" + attribute + String.fromCharCode(0));
-          testsToRun.push("svgView(" + attribute + "(" + String.fromCharCode(0) + ")");
       }
-      
     }
-    
+
+    function zoomAndPanToString(zoomAndPan)
+    {
+        if (zoomAndPan == SVGZoomAndPan.SVG_ZOOMANDPAN_MAGNIFY)
+            return "magnify";
+        if (zoomAndPan == SVGZoomAndPan.SVG_ZOOMANDPAN_DISABLE)
+            return "disable";
+        return "unknown";
+    }
+
     function viewSpecToString(viewSpec)
     {
         if (!viewSpec)
-          return viewSpec;
-        
+          return undefined;
+
         var attributes = [];
-        if (viewSpec.transform)
-          attributes.push("transform(" + viewSpec.transform + ")");
-        if (viewSpec.viewBox)
-          attributes.push("viewBox(" + viewSpec.viewBox + ")");
-        if (viewSpec.preserveAspectRatio)
-          attributes.push("preserveAspectRatio(" + viewSpec.preserveAspectRatio + ")");
-        if (viewSpec.zoomAndPan)
-          attributes.push("zoomAndPan(" + viewSpec.zoomAndPan + ")");
-        if (viewSpec.viewTarget)
-          attributes.push("viewTarget(" + viewSpac.viewTarget + ")");
-          
+        if (viewSpec.transformString)
+          attributes.push("transform(" + viewSpec.transformString + ")");
+        if (viewSpec.viewBoxString && viewSpec.viewBoxString != "0 0 0 0")
+          attributes.push("viewBox(" + viewSpec.viewBoxString + ")");
+        if (viewSpec.preserveAspectRatioString && viewSpec.preserveAspectRatioString != "xMidYMid meet")
+          attributes.push("preserveAspectRatio(" + viewSpec.preserveAspectRatioString + ")");
+        if (viewSpec.zoomAndPan && viewSpec.zoomAndPan != SVGZoomAndPan.SVG_ZOOMANDPAN_MAGNIFY)
+          attributes.push("zoomAndPan(" + zoomAndPanToString(viewSpec.zoomAndPan) + ")");
+        if (viewSpec.viewTargetString)
+          attributes.push("viewTarget(" + viewSpec.viewTargetString + ")");
+        if (!attributes.length)
+          return "[initial view]";
         return "svgView(" + attributes.join(";") + ")";
     }
-    
+
     var testNumber = 0;
     var testString = "[initial view]"
-    
+
     function makeURLRelative(url) {
       return url.slice(url.indexOf("resources"));
@@ -132 +145 @@
       embedElement.setAttribute("width", "100");
       embedElement.setAttribute("height", "100");
-      embedElement.setAttribute("onload", "continueFuzzing(event)");
-      var newURL = "resources/viewspec-parser.svg#" + string;
+      embedElement.setAttribute("onload", "setTimeout('continueFuzzing(event)', 0)");
+      var newURL = "resources/viewspec-target.svg#" + string;
       embedElement.src = newURL;
-      debug("Starting: " + makeURLRelative(embedElement.src));
       document.body.appendChild(embedElement);
     }
@@ -143 +155 @@
       testFragment(testString);
     }
-    
+
     function continueFuzzing(event)
     {
         var embedElement = document.getElementById("object");
         if (embedElement.contentDocument) {
-          debug("Loaded:   " + makeURLRelative(embedElement.contentDocument.URL));
-          debug("Parsed: " + viewSpecToString(embedElement.contentDocument.currentView) + " from: " + testString);      
+          debug("Loaded: " + makeURLRelative(embedElement.contentDocument.URL));
+          debug("Parsed: " + viewSpecToString(embedElement.contentDocument.documentElement.currentView) + " from: " + testString + "\n");
         } else
           debug("no svgdocument");
-        
+
         if (testNumber < testsToRun.length)
           testString = testsToRun[testNumber];
         else {
-          var scriptTag = document.createElement("script");
-          scriptTag.src = "../../fast/js/resources/js-test-post.js";
-          document.body.appendChild(scriptTag);
-          if (window.layoutTestController)
-            layoutTestController.notifyDone();
+          var script = document.createElement("script");
+
+          script.onload = function() {
+              if (window.layoutTestController)
+                  layoutTestController.notifyDone();
+          };
+
+          script.src = "../../fast/js/resources/js-test-post.js";
+          document.body.appendChild(script);
           return;
         }
         testNumber++;
-        
+
         // this lets us out of the onload handler so we don't overrun the stack
         window.setTimeout(startNextTest, 0);
@@ -170 +186 @@
     if (window.layoutTestController)
       layoutTestController.waitUntilDone();
-    
+
     buildTestsToRun();
     testFragment("");

trunk/Source/WebCore/CMakeLists.txt

@@ -1977 +1977 @@
         svg/SVGUseElement.cpp
         svg/SVGViewElement.cpp
+        svg/SVGViewSpec.cpp
         svg/SVGVKernElement.cpp
-        svg/SVGViewSpec.cpp
         svg/SVGZoomAndPan.cpp
         svg/SVGZoomEvent.cpp
@@ -2136 +2136 @@
         svg/SVGUseElement.idl
         svg/SVGViewElement.idl
+        svg/SVGViewSpec.idl
         svg/SVGVKernElement.idl
         svg/SVGZoomAndPan.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-29  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        SVGViewSpec DOM bindings aka SVGSVGElement.currentView is unimplemented
+        https://bugs.webkit.org/show_bug.cgi?id=15495
+
+        Reviewed by Rob Buis.
+
+        Finish SVGViewSpec implementation and expose it to the Web. Numerous smaller bugs are fixed:
+        - SVGViewSpec and all of its contents should be read-only. Enforce that and test it.
+          Add a new enum to SVGPropertyInfo so that each SVGAnimatedProperty knows if its content is supposed to be read-write or read-only.
+        - Make the 'transform' attribute of SVGViewSpec exposable by switching to a SVGTransformListProperty - it can now be accessed from JS.
+        - Assure that following XXXString methods are in sync with the corresponding SVG DOM interfaces
+            readonly attribute DOMString viewBoxString;
+            readonly attribute DOMString preserveAspectRatioString;
+            readonly attribute DOMString transformString;
+            readonly attribute DOMString viewTargetString;
+        - Cleanup code in svg/properties that was intended to handle SVGViewSpec. Turns out lot of the complexity was unncessary, and can be removed.
+        - Move SVGFitToViewBox to the same pattern SVGZoomAndPan uses since two days, that avoids any virtual function calls for attribute parsing.
+        - Create/expose ObjectiveC/JS bindings for SVGViewSpec.
+        - Enable SVGViewSpec constructor.
+
+        Tests: svg/custom/linking-a-03-b-all-expected.svg
+               svg/dom/SVGViewSpec-defaults.html
+               svg/dom/SVGViewSpec.html
+               svg/dom/complex-svgView-specification.html
+               svg/dom/viewspec-parser.html
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * WebCore.order:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSSVGLengthCustom.cpp:
+        (WebCore::JSSVGLength::setValue):
+        (WebCore::JSSVGLength::convertToSpecifiedUnits):
+        * bindings/objc/DOMSVG.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        (NativeToJSValue):
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (GenerateImplementation):
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateNormalAttrGetter):
+        (GenerateNormalAttrSetter):
+        (GenerateFunctionCallback):
+        * bindings/v8/custom/V8SVGLengthCustom.cpp:
+        (WebCore::V8SVGLength::valueAccessorSetter):
+        (WebCore::V8SVGLength::convertToSpecifiedUnitsCallback):
+        * page/DOMWindow.idl:
+        * rendering/svg/RenderSVGResourcePattern.cpp:
+        (WebCore::RenderSVGResourcePattern::buildTileImageTransform):
+        * svg/SVGFitToViewBox.cpp:
+        * svg/SVGFitToViewBox.h:
+        (SVGFitToViewBox):
+        (WebCore::SVGFitToViewBox::parseAttribute):
+        * svg/SVGMarkerElement.cpp:
+        (WebCore::SVGMarkerElement::orientTypePropertyInfo):
+        (WebCore::SVGMarkerElement::parseAttribute):
+        (WebCore::SVGMarkerElement::synchronizeOrientType):
+        (WebCore::SVGMarkerElement::lookupOrCreateOrientTypeWrapper):
+        * svg/SVGPathElement.cpp:
+        (WebCore::SVGPathElement::dPropertyInfo):
+        (WebCore::SVGPathElement::svgAttributeChanged):
+        (WebCore::SVGPathElement::pathByteStream):
+        (WebCore::SVGPathElement::lookupOrCreateDWrapper):
+        (WebCore::SVGPathElement::synchronizeD):
+        * svg/SVGPathSegWithContext.h:
+        (WebCore::SVGPathSegWithContext::animatedProperty):
+        * svg/SVGPatternElement.cpp:
+        (WebCore::SVGPatternElement::parseAttribute):
+        * svg/SVGPolyElement.cpp:
+        (WebCore::SVGPolyElement::pointsPropertyInfo):
+        (WebCore::SVGPolyElement::parseAttribute):
+        (WebCore::SVGPolyElement::synchronizePoints):
+        (WebCore::SVGPolyElement::lookupOrCreatePointsWrapper):
+        * svg/SVGRect.h:
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::~SVGSVGElement):
+        (WebCore::SVGSVGElement::currentView):
+        (WebCore::SVGSVGElement::parseAttribute):
+        (WebCore::SVGSVGElement::currentViewBoxRect):
+        (WebCore::SVGSVGElement::viewBoxToViewTransform):
+        (WebCore::SVGSVGElement::setupInitialView):
+        (WebCore::SVGSVGElement::inheritViewAttributes):
+        * svg/SVGSVGElement.h:
+        (SVGSVGElement):
+        * svg/SVGSVGElement.idl:
+        * svg/SVGSymbolElement.cpp:
+        (WebCore::SVGSymbolElement::parseAttribute):
+        * svg/SVGTests.cpp:
+        (WebCore::SVGTests::requiredFeaturesPropertyInfo):
+        (WebCore::SVGTests::requiredExtensionsPropertyInfo):
+        (WebCore::SVGTests::systemLanguagePropertyInfo):
+        (WebCore::SVGTests::synchronizeRequiredFeatures):
+        (WebCore::SVGTests::synchronizeRequiredExtensions):
+        (WebCore::SVGTests::synchronizeSystemLanguage):
+        * svg/SVGTextContentElement.cpp:
+        (WebCore::SVGTextContentElement::textLengthPropertyInfo):
+        (WebCore::SVGTextContentElement::synchronizeTextLength):
+        (WebCore::SVGTextContentElement::lookupOrCreateTextLengthWrapper):
+        * svg/SVGViewElement.cpp:
+        (WebCore::SVGViewElement::parseAttribute):
+        * svg/SVGViewElement.h:
+        * svg/SVGViewSpec.cpp:
+        (WebCore::SVGViewSpec::viewBoxPropertyInfo):
+        (WebCore::SVGViewSpec::preserveAspectRatioPropertyInfo):
+        (WebCore::SVGViewSpec::transformPropertyInfo):
+        (WebCore::SVGViewSpec::SVGViewSpec):
+        (WebCore::SVGViewSpec::viewBoxIdentifier):
+        (WebCore::SVGViewSpec::preserveAspectRatioIdentifier):
+        (WebCore::SVGViewSpec::transformIdentifier):
+        (WebCore::SVGViewSpec::setZoomAndPan):
+        (WebCore::SVGViewSpec::setTransformString):
+        (WebCore::SVGViewSpec::transformString):
+        (WebCore::SVGViewSpec::viewBoxString):
+        (WebCore::SVGViewSpec::preserveAspectRatioString):
+        (WebCore::SVGViewSpec::viewTarget):
+        (WebCore::SVGViewSpec::transform):
+        (WebCore::SVGViewSpec::lookupOrCreateViewBoxWrapper):
+        (WebCore::SVGViewSpec::lookupOrCreatePreserveAspectRatioWrapper):
+        (WebCore::SVGViewSpec::lookupOrCreateTransformWrapper):
+        (WebCore::SVGViewSpec::reset):
+        (WebCore::SVGViewSpec::parseViewSpec):
+        * svg/SVGViewSpec.h:
+        (WebCore::SVGViewSpec::~SVGViewSpec):
+        (SVGViewSpec):
+        (WebCore::SVGViewSpec::create):
+        (WebCore::SVGViewSpec::setViewTargetString):
+        (WebCore::SVGViewSpec::setZoomAndPan):
+        (WebCore::SVGViewSpec::contextElement):
+        (WebCore::SVGViewSpec::resetContextElement):
+        (WebCore::SVGViewSpec::transformBaseValue):
+        (WebCore::SVGViewSpec::viewBoxAnimated):
+        (WebCore::SVGViewSpec::viewBox):
+        (WebCore::SVGViewSpec::viewBoxBaseValue):
+        (WebCore::SVGViewSpec::setViewBoxBaseValue):
+        (WebCore::SVGViewSpec::preserveAspectRatioAnimated):
+        (WebCore::SVGViewSpec::preserveAspectRatio):
+        (WebCore::SVGViewSpec::preserveAspectRatioBaseValue):
+        (WebCore::SVGViewSpec::setPreserveAspectRatioBaseValue):
+        * svg/SVGViewSpec.idl:
+        * svg/properties/SVGAnimatedProperty.h:
+        (WebCore::SVGAnimatedProperty::isReadOnly):
+        (WebCore::SVGAnimatedProperty::setIsReadOnly):
+        (SVGAnimatedProperty):
+        (WebCore::SVGAnimatedProperty::lookupOrCreateWrapper):
+        (WebCore::SVGAnimatedProperty::lookupWrapper):
+        (WebCore::SVGAnimatedProperty::SVGAnimatedProperty):
+        * svg/properties/SVGAnimatedPropertyMacros.h:
+        (WebCore::SVGSynchronizableAnimatedProperty::synchronize):
+        (SVGSynchronizableAnimatedProperty):
+        * svg/properties/SVGAnimatedPropertySynchronizer.h: Removed.
+        * svg/properties/SVGAttributeToPropertyMap.h:
+        * svg/properties/SVGListProperty.h:
+        * svg/properties/SVGListPropertyTearOff.h:
+        (SVGListPropertyTearOff):
+        (WebCore::SVGListPropertyTearOff::isReadOnly):
+        * svg/properties/SVGPathSegListPropertyTearOff.h:
+        (SVGPathSegListPropertyTearOff):
+        (WebCore::SVGPathSegListPropertyTearOff::isReadOnly):
+        * svg/properties/SVGProperty.h:
+        (SVGProperty):
+        * svg/properties/SVGPropertyInfo.h:
+        (WebCore::SVGPropertyInfo::SVGPropertyInfo):
+        (SVGPropertyInfo):
+        * svg/properties/SVGPropertyTearOff.h:
+        (WebCore::SVGPropertyTearOff::isReadOnly):
+        * svg/properties/SVGStaticListPropertyTearOff.h:
+        (SVGStaticListPropertyTearOff):
+        (WebCore::SVGStaticListPropertyTearOff::isReadOnly):
+
 2012-05-29  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/DerivedSources.cpp

@@ -438 +438 @@
 #include "JSSVGUnitTypes.cpp"
 #include "JSSVGUseElement.cpp"
+#include "JSSVGVKernElement.cpp"
 #include "JSSVGViewElement.cpp"
-#include "JSSVGVKernElement.cpp"
+#include "JSSVGViewSpec.cpp"
 #include "JSSVGZoomAndPan.cpp"
 #include "JSSVGZoomEvent.cpp"

trunk/Source/WebCore/DerivedSources.make

@@ -576 +576 @@
     $(WebCore)/svg/SVGVKernElement.idl \
     $(WebCore)/svg/SVGViewElement.idl \
+    $(WebCore)/svg/SVGViewSpec.idl \
     $(WebCore)/svg/SVGZoomAndPan.idl \
     $(WebCore)/svg/SVGZoomEvent.idl \

trunk/Source/WebCore/DerivedSources.pri

@@ -607 +607 @@
     $$PWD/svg/SVGViewElement.idl \
     $$PWD/svg/SVGVKernElement.idl \
+    $$PWD/svg/SVGViewSpec.idl \
     $$PWD/svg/SVGZoomAndPan.idl \
     $$PWD/svg/SVGZoomEvent.idl

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4203 +4203 @@
         Source/WebCore/svg/properties/SVGAnimatedPropertyDescription.h \
         Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h \
-        Source/WebCore/svg/properties/SVGAnimatedPropertySynchronizer.h \
         Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h \
         Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h \
@@ -5393 +5392 @@
         DerivedSources/WebCore/JSSVGViewElement.cpp \
         DerivedSources/WebCore/JSSVGViewElement.h \
+        DerivedSources/WebCore/JSSVGViewSpec.cpp \
         DerivedSources/WebCore/JSSVGViewSpec.h \
         DerivedSources/WebCore/JSSVGVKernElement.cpp \
@@ -5542 +5542 @@
         $(WebCore)/svg/SVGVKernElement.idl \
         $(WebCore)/svg/SVGViewElement.idl \
+        $(WebCore)/svg/SVGViewSpec.idl \
         $(WebCore)/svg/SVGZoomAndPan.idl \
         $(WebCore)/svg/SVGZoomEvent.idl

trunk/Source/WebCore/Target.pri

@@ -2635 +2635 @@
     svg/properties/SVGAnimatedPropertyDescription.h \
     svg/properties/SVGAnimatedPropertyMacros.h \
-    svg/properties/SVGAnimatedPropertySynchronizer.h \
     svg/properties/SVGAnimatedPropertyTearOff.h \
     svg/properties/SVGAnimatedStaticPropertyTearOff.h \

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -174 +174 @@
       '../svg/SVGTests.idl',
       '../svg/SVGTransformable.idl',
-      '../svg/SVGViewSpec.idl',
 
       # FIXME: I don't know why these are excluded, either.

trunk/Source/WebCore/WebCore.gypi

@@ -740 +740 @@
             'svg/properties/SVGAnimatedPropertyDescription.h',
             'svg/properties/SVGAnimatedPropertyMacros.h',
-            'svg/properties/SVGAnimatedPropertySynchronizer.h',
             'svg/properties/SVGAnimatedPropertyTearOff.h',
             'svg/properties/SVGAnimatedStaticPropertyTearOff.h',
@@ -7169 +7168 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGVKernElement.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGVKernElementInternal.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGViewSpec.dep',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGViewSpec.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGViewElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGViewElement.mm',
@@ -8133 +8134 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGViewElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGViewElement.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGViewSpec.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGViewSpec.dep',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGViewSpec.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGZoomAndPan.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGZoomAndPan.h',

trunk/Source/WebCore/WebCore.order

@@ -29346 +29346 @@
 __ZN7WebCore8SVGTests27synchronizeRequiredFeaturesEPNS_10SVGElementE
 __ZNK7WebCore13SVGStringList13valueAsStringEv
-__ZN7WebCore31SVGAnimatedPropertySynchronizerILb1EE11synchronizeEPNS_10SVGElementERKNS_13QualifiedNameERKN3WTF12AtomicStringE
 __ZN7WebCore8SVGTests29synchronizeRequiredExtensionsEPNS_10SVGElementE
 __ZN7WebCore8SVGTests25synchronizeSystemLanguageEPNS_10SVGElementE

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -21835 +21835 @@
                         </File>
                         <File
+                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGViewSpec.cpp"
+                                >
+                                <FileConfiguration
+                                        Name="Debug|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug_Cairo_CFLite|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release_Cairo_CFLite|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug_All|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Production|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGViewSpec.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGVKernElement.cpp"
                                 >
@@ -72183 +72239 @@
                                 </File>
                                 <File
-                                        RelativePath="..\svg\properties\SVGAnimatedPropertySynchronizer.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\svg\properties\SVGAnimatedPropertyTearOff.h"
                                         >

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -138 +138 @@
                 081668DA125603D5006F25DE /* SVGTextLayoutEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 081668D8125603D5006F25DE /* SVGTextLayoutEngine.h */; };
                 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 081AA8D91111237E002AB06E /* SVGElementRareData.h */; };
-                081CDFBF126ECFE800D215CA /* SVGAnimatedPropertySynchronizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 081CDFBE126ECFE800D215CA /* SVGAnimatedPropertySynchronizer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 081DD49C13BA1A6000DC7627 /* SVGPropertyInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 081DD49B13BA1A6000DC7627 /* SVGPropertyInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 081EBF3A0FD34F4100DA7559 /* SVGFilterBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */; };
@@ -1805 +1804 @@
                 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */; };
                 7117445914BC34EC00EE5FC8 /* SVGTextMetricsBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 7117445714BC34E200EE5FC8 /* SVGTextMetricsBuilder.h */; };
+                7118FED415685CC60030B79A /* JSSVGViewSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7118FED215685CC60030B79A /* JSSVGViewSpec.cpp */; };
+                7118FED515685CC60030B79A /* JSSVGViewSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 7118FED315685CC60030B79A /* JSSVGViewSpec.h */; };
                 7134496D146941B300720312 /* SVGLengthContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7134496B146941B300720312 /* SVGLengthContext.cpp */; };
                 7134496E146941B300720312 /* SVGLengthContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 7134496C146941B300720312 /* SVGLengthContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 71537A01146BD9D7008BD615 /* SVGPathData.h in Headers */ = {isa = PBXBuildFile; fileRef = 715379FF146BD9D6008BD615 /* SVGPathData.h */; };
                 7157F062150B6564006EAABD /* SVGAnimatedTransformList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */; };
+                717A1981156A63BE00F9FE8C /* DOMSVGViewSpecInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 710867D51568644B00AA779B /* DOMSVGViewSpecInternal.h */; };
+                71904DE8156A631C001E1BA5 /* DOMSVGViewSpec.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 71FE57EE156A620600ABEBD3 /* DOMSVGViewSpec.h */; };
+                71904DEA156A633A001E1BA5 /* DOMSVGViewSpecInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 718512331568649800C40967 /* DOMSVGViewSpecInternal.h */; };
                 71A57DF1154BE25C0009D120 /* SVGPathUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */; };
                 71A57DF2154BE25C0009D120 /* SVGPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */; };
@@ -1816 +1820 @@
                 71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; };
                 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                71FE57F0156A620600ABEBD3 /* DOMSVGViewSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FE57EE156A620600ABEBD3 /* DOMSVGViewSpec.h */; };
+                71FE57F1156A620600ABEBD3 /* DOMSVGViewSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71FE57EF156A620600ABEBD3 /* DOMSVGViewSpec.mm */; };
                 72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72626E010EF022FE00A07E20 /* FontFastPath.cpp */; };
                 750D029311D0E7F300BD1B27 /* RenderInputSpeech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */; };
@@ -6876 +6882 @@
                                 A8F46A910CB20A9D003A9670 /* DOMSVGViewElement.h in Copy Generated Headers */,
                                 A80F3B5F0CCDCE24002DD990 /* DOMSVGViewElementInternal.h in Copy Generated Headers */,
+                                71904DE8156A631C001E1BA5 /* DOMSVGViewSpec.h in Copy Generated Headers */,
                                 A8F46AFD0CB20A9D003A9670 /* DOMSVGZoomAndPan.h in Copy Generated Headers */,
+                                71904DEA156A633A001E1BA5 /* DOMSVGViewSpecInternal.h in Copy Generated Headers */,
                                 A8F46A930CB20A9D003A9670 /* DOMSVGZoomEvent.h in Copy Generated Headers */,
                                 A80F3BB10CCDCE24002DD990 /* DOMSVGZoomEventInternal.h in Copy Generated Headers */,
@@ -7016 +7024 @@
                 081668D8125603D5006F25DE /* SVGTextLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextLayoutEngine.h; sourceTree = "<group>"; };
                 081AA8D91111237E002AB06E /* SVGElementRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGElementRareData.h; sourceTree = "<group>"; };
-                081CDFBE126ECFE800D215CA /* SVGAnimatedPropertySynchronizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertySynchronizer.h; sourceTree = "<group>"; };
                 081DD49B13BA1A6000DC7627 /* SVGPropertyInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPropertyInfo.h; sourceTree = "<group>"; };
                 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilterBuilder.cpp; sourceTree = "<group>"; };
@@ -8853 +8860 @@
                 6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLContextAttributes.cpp; sourceTree = "<group>"; };
                 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLContextAttributes.h; sourceTree = "<group>"; };
+                710867D51568644B00AA779B /* DOMSVGViewSpecInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGViewSpecInternal.h; sourceTree = "<group>"; };
                 7117445614BC34E200EE5FC8 /* SVGTextMetricsBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextMetricsBuilder.cpp; sourceTree = "<group>"; };
                 7117445714BC34E200EE5FC8 /* SVGTextMetricsBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextMetricsBuilder.h; sourceTree = "<group>"; };
+                7118FED215685CC60030B79A /* JSSVGViewSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGViewSpec.cpp; sourceTree = "<group>"; };
+                7118FED315685CC60030B79A /* JSSVGViewSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGViewSpec.h; sourceTree = "<group>"; };
                 7134496B146941B300720312 /* SVGLengthContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLengthContext.cpp; sourceTree = "<group>"; };
                 7134496C146941B300720312 /* SVGLengthContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLengthContext.h; sourceTree = "<group>"; };
@@ -8860 +8870 @@
                 715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; };
                 7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTransformList.cpp; sourceTree = "<group>"; };
+                718512331568649800C40967 /* DOMSVGViewSpecInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMSVGViewSpecInternal.h; sourceTree = "<group>"; };
                 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
                 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
@@ -8868 +8879 @@
                 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; };
                 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedEnumerationPropertyTearOff.h; sourceTree = "<group>"; };
+                71FE57EE156A620600ABEBD3 /* DOMSVGViewSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGViewSpec.h; sourceTree = "<group>"; };
+                71FE57EF156A620600ABEBD3 /* DOMSVGViewSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGViewSpec.mm; sourceTree = "<group>"; };
                 72626E010EF022FE00A07E20 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; };
                 750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderInputSpeech.cpp; sourceTree = "<group>"; };
@@ -13789 +13802 @@
                                 088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */,
                                 088A0DFE126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h */,
-                                081CDFBE126ECFE800D215CA /* SVGAnimatedPropertySynchronizer.h */,
                                 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */,
                                 08525E621278C00100A84778 /* SVGAnimatedStaticPropertyTearOff.h */,
@@ -16196 +16208 @@
                                 859D62980AD888EF00012995 /* DOMSVGViewElement.mm */,
                                 A8E543C90CA9D1C10097D09B /* DOMSVGViewElementInternal.h */,
+                                71FE57EE156A620600ABEBD3 /* DOMSVGViewSpec.h */,
+                                71FE57EF156A620600ABEBD3 /* DOMSVGViewSpec.mm */,
+                                718512331568649800C40967 /* DOMSVGViewSpecInternal.h */,
                                 84852281119016A7006EDC7F /* DOMSVGVKernElement.h */,
                                 84852282119016A7006EDC7F /* DOMSVGVKernElement.mm */,
@@ -16653 +16668 @@
                                 859D62D90AD8892700012995 /* DOMSVGUseElementInternal.h */,
                                 859D62DA0AD8892700012995 /* DOMSVGViewElementInternal.h */,
+                                710867D51568644B00AA779B /* DOMSVGViewSpecInternal.h */,
                                 859D62DB0AD8892700012995 /* DOMSVGZoomEventInternal.h */,
                                 4429AB070CB84F81007647C5 /* DOMTextEventInternal.h */,
@@ -18382 +18398 @@
                                 B2FA3D2E0AB75A6F000E5AC4 /* JSSVGViewElement.cpp */,
                                 B2FA3D2F0AB75A6F000E5AC4 /* JSSVGViewElement.h */,
+                                7118FED215685CC60030B79A /* JSSVGViewSpec.cpp */,
+                                7118FED315685CC60030B79A /* JSSVGViewSpec.h */,
                                 848522791190162C006EDC7F /* JSSVGVKernElement.cpp */,
                                 8485227A1190162C006EDC7F /* JSSVGVKernElement.h */,
@@ -24466 +24484 @@
                                 088A0E06126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h in Headers */,
                                 088A0E07126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h in Headers */,
-                                081CDFBF126ECFE800D215CA /* SVGAnimatedPropertySynchronizer.h in Headers */,
                                 088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */,
                                 08C859C01274575400A5728D /* SVGAnimatedRect.h in Headers */,
@@ -24958 +24975 @@
                                 71DCB7021568197600862271 /* JSSVGZoomAndPan.h in Headers */,
                                 0F3F0E5A157030C3006DA57F /* RenderGeometryMap.h in Headers */,
+                                7118FED515685CC60030B79A /* JSSVGViewSpec.h in Headers */,
+                                71FE57F0156A620600ABEBD3 /* DOMSVGViewSpec.h in Headers */,
+                                717A1981156A63BE00F9FE8C /* DOMSVGViewSpecInternal.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -27990 +28010 @@
                                 71DCB7011568197600862271 /* JSSVGZoomAndPan.cpp in Sources */,
                                 0F3F0E59157030C3006DA57F /* RenderGeometryMap.cpp in Sources */,
+                                7118FED415685CC60030B79A /* JSSVGViewSpec.cpp in Sources */,
+                                71FE57F1156A620600ABEBD3 /* DOMSVGViewSpec.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp

@@ -49 +49 @@
 void JSSVGLength::setValue(ExecState* exec, JSValue value)
 {
-    if (impl()->role() == AnimValRole) {
+    if (impl()->isReadOnly()) {
         setDOMException(exec, NO_MODIFICATION_ALLOWED_ERR);
         return;
@@ -74 +74 @@
 JSValue JSSVGLength::convertToSpecifiedUnits(ExecState* exec)
 {
-    if (impl()->role() == AnimValRole) {
+    if (impl()->isReadOnly()) {
         setDOMException(exec, NO_MODIFICATION_ALLOWED_ERR);
         return jsUndefined();

trunk/Source/WebCore/bindings/objc/DOMSVG.h

@@ -170 +170 @@
 #import <WebCore/DOMSVGUseElement.h>
 #import <WebCore/DOMSVGViewElement.h>
+#import <WebCore/DOMSVGViewSpec.h>
 #import <WebCore/DOMSVGZoomAndPan.h>
 #import <WebCore/DOMSVGZoomEvent.h>

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1957 +1957 @@
                             if ($svgPropertyOrListPropertyType) {
                                 if ($svgPropertyType) {
-                                    push(@implContent, "    if (impl->role() == AnimValRole) {\n");
+                                    push(@implContent, "    if (impl->isReadOnly()) {\n");
                                     push(@implContent, "        setDOMException(exec, NO_MODIFICATION_ALLOWED_ERR);\n");
                                     push(@implContent, "        return;\n");
@@ -2130 +2130 @@
                     push(@implContent, "    $implType* impl = static_cast<$implType*>(castedThis->impl());\n");
                     if ($svgPropertyType) {
-                        push(@implContent, "    if (impl->role() == AnimValRole) {\n");
+                        push(@implContent, "    if (impl->isReadOnly()) {\n");
                         push(@implContent, "        setDOMException(exec, NO_MODIFICATION_ALLOWED_ERR);\n");
                         push(@implContent, "        return JSValue::encode(jsUndefined());\n");
@@ -3100 +3100 @@
     }
 
-    if ($codeGenerator->IsSVGAnimatedType($implClassName)) {
+    if ($codeGenerator->IsSVGAnimatedType($implClassName) or $implClassName eq "SVGViewSpec") {
         # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
         $value = "static_cast<" . GetNativeType($type) . ">($value)";

trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -1329 +1329 @@
                     }
                 }
-            } elsif ($codeGenerator->IsSVGAnimatedType($implClassName) and $codeGenerator->IsSVGTypeNeedingTearOff($idlType)) {
+            } elsif (($codeGenerator->IsSVGAnimatedType($implClassName) or $implClassName eq "SVGViewSpec") and $codeGenerator->IsSVGTypeNeedingTearOff($idlType)) {
                 my $idlTypeWithNamespace = GetSVGTypeWithNamespace($idlType);
                 $getterContentHead = "kit(static_cast<$idlTypeWithNamespace*>($getterContentHead)";
@@ -1437 +1437 @@
                     $implIncludes{"ExceptionCode.h"} = 1;
                     $getterContentHead = "$getterExpressionPrefix";
-                    push(@implContent, "    if (IMPL->role() == WebCore::AnimValRole) {\n");
+                    push(@implContent, "    if (IMPL->isReadOnly()) {\n");
                     push(@implContent, "        WebCore::raiseOnDOMError(WebCore::NO_MODIFICATION_ALLOWED_ERR);\n");
                     push(@implContent, "        return;\n");
@@ -1637 +1637 @@
             } elsif ($svgPropertyType) {
                 $implIncludes{"ExceptionCode.h"} = 1;
-                push(@functionContent, "    if (IMPL->role() == WebCore::AnimValRole) {\n");
+                push(@functionContent, "    if (IMPL->isReadOnly()) {\n");
                 push(@functionContent, "        WebCore::raiseOnDOMError(WebCore::NO_MODIFICATION_ALLOWED_ERR);\n");
                 if ($returnType eq "void") {

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -946 +946 @@
     }
 
-    if ($codeGenerator->IsSVGAnimatedType($implClassName) and $codeGenerator->IsSVGTypeNeedingTearOff($attrType)) {
+    if (($codeGenerator->IsSVGAnimatedType($implClassName) or $implClassName eq "SVGViewSpec") and $codeGenerator->IsSVGTypeNeedingTearOff($attrType)) {
         AddToImplIncludes("V8$attrType.h");
         my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
@@ -1062 +1062 @@
             AddToImplIncludes("ExceptionCode.h");
             push(@implContentDecls, "    $svgNativeType* wrapper = V8${implClassName}::toNative(info.Holder());\n");
-            push(@implContentDecls, "    if (wrapper->role() == AnimValRole) {\n");
+            push(@implContentDecls, "    if (wrapper->isReadOnly()) {\n");
             push(@implContentDecls, "        V8Proxy::setDOMException(NO_MODIFICATION_ALLOWED_ERR, info.GetIsolate());\n");
             push(@implContentDecls, "        return;\n");
@@ -1396 +1396 @@
             AddToImplIncludes("ExceptionCode.h");
             push(@implContentDecls, "    $nativeClassName wrapper = V8${implClassName}::toNative(args.Holder());\n");
-            push(@implContentDecls, "    if (wrapper->role() == AnimValRole)\n");
+            push(@implContentDecls, "    if (wrapper->isReadOnly())\n");
             push(@implContentDecls, "        return V8Proxy::setDOMException(NO_MODIFICATION_ALLOWED_ERR, args.GetIsolate());\n");
             my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implClassName);

trunk/Source/WebCore/bindings/v8/custom/V8SVGLengthCustom.cpp

@@ -59 +59 @@
     INC_STATS("DOM.SVGLength.value._set");
     SVGPropertyTearOff<SVGLength>* wrapper = V8SVGLength::toNative(info.Holder());
-    if (wrapper->role() == AnimValRole) {
+    if (wrapper->isReadOnly()) {
         V8Proxy::setDOMException(NO_MODIFICATION_ALLOWED_ERR, info.GetIsolate());
         return;
@@ -83 +83 @@
     INC_STATS("DOM.SVGLength.convertToSpecifiedUnits");
     SVGPropertyTearOff<SVGLength>* wrapper = V8SVGLength::toNative(args.Holder());
-    if (wrapper->role() == AnimValRole)
+    if (wrapper->isReadOnly())
         return V8Proxy::setDOMException(NO_MODIFICATION_ALLOWED_ERR, args.GetIsolate());
 

trunk/Source/WebCore/page/DOMWindow.idl

@@ -709 +709 @@
         attribute SVGUseElementConstructor SVGUseElement;
         attribute SVGViewElementConstructor SVGViewElement;
-//      attribute SVGViewSpecConstructor SVGViewSpec;
+        attribute SVGViewSpecConstructor SVGViewSpec;
         attribute SVGZoomAndPanConstructor SVGZoomAndPan;
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

@@ -28 +28 @@
 #include "PatternAttributes.h"
 #include "RenderSVGRoot.h"
+#include "SVGFitToViewBox.h"
 #include "SVGRenderSupport.h"
 #include "SVGRenderingContext.h"
@@ -216 +217 @@
         return false;
 
-    AffineTransform viewBoxCTM = patternElement->viewBoxToViewTransform(attributes.viewBox(), attributes.preserveAspectRatio(), patternBoundaries.width(), patternBoundaries.height());
+    AffineTransform viewBoxCTM = SVGFitToViewBox::viewBoxToViewTransform(attributes.viewBox(), attributes.preserveAspectRatio(), patternBoundaries.width(), patternBoundaries.height());
 
     // Apply viewBox/objectBoundingBox transformations.

trunk/Source/WebCore/svg/SVGFitToViewBox.cpp

@@ -89 +89 @@
 }
 
-bool SVGFitToViewBox::parseAttribute(Document* document, const Attribute& attribute)
-{
-    if (attribute.name() == SVGNames::viewBoxAttr) {
-        FloatRect viewBox;
-        if (!attribute.isNull())
-            parseViewBox(document, attribute.value(), viewBox);
-        setViewBoxBaseValue(viewBox);
-        return true;
-    }
-
-    if (attribute.name() == SVGNames::preserveAspectRatioAttr) {
-        SVGPreserveAspectRatio preserveAspectRatio;
-        preserveAspectRatio.parse(attribute.value());
-        setPreserveAspectRatioBaseValue(preserveAspectRatio);
-        return true;
-    }
-
-    return false;
-}
-
 bool SVGFitToViewBox::isKnownAttribute(const QualifiedName& attrName)
 {

trunk/Source/WebCore/svg/SVGFitToViewBox.h

@@ -23 +23 @@
 
 #if ENABLE(SVG)
+#include "Attribute.h"
+#include "FloatRect.h"
 #include "QualifiedName.h"
+#include "SVGNames.h"
+#include "SVGPreserveAspectRatio.h"
 #include <wtf/HashSet.h>
 
@@ -29 +33 @@
 
 class AffineTransform;
-class Attribute;
 class Document;
-class FloatRect;
-class SVGPreserveAspectRatio;
 
 class SVGFitToViewBox {
 public:
-    virtual ~SVGFitToViewBox() { }
-
-    bool parseViewBox(Document*, const UChar*& start, const UChar* end, FloatRect& viewBox, bool validate = true);
     static AffineTransform viewBoxToViewTransform(const FloatRect& viewBoxRect, const SVGPreserveAspectRatio&, float viewWidth, float viewHeight);
 
-    bool parseAttribute(Document*, const Attribute&);
-    bool isKnownAttribute(const QualifiedName&);
-    void addSupportedAttributes(HashSet<QualifiedName>&);
+    static bool isKnownAttribute(const QualifiedName&);
+    static void addSupportedAttributes(HashSet<QualifiedName>&);
 
-    virtual void setViewBoxBaseValue(const FloatRect&) = 0;
-    virtual void setPreserveAspectRatioBaseValue(const SVGPreserveAspectRatio&) = 0;
+    template<class SVGElementTarget>
+    static bool parseAttribute(SVGElementTarget* target, const Attribute& attribute)
+    {
+        ASSERT(target);
+        ASSERT(target->document());
+        if (attribute.name() == SVGNames::viewBoxAttr) {
+            FloatRect viewBox;
+            if (!attribute.isNull())
+                parseViewBox(target->document(), attribute.value(), viewBox);
+            target->setViewBoxBaseValue(viewBox);
+            return true;
+        }
+
+        if (attribute.name() == SVGNames::preserveAspectRatioAttr) {
+            SVGPreserveAspectRatio preserveAspectRatio;
+            preserveAspectRatio.parse(attribute.value());
+            target->setPreserveAspectRatioBaseValue(preserveAspectRatio);
+            return true;
+        }
+
+        return false;
+    }
+
+    static bool parseViewBox(Document*, const UChar*& start, const UChar* end, FloatRect& viewBox, bool validate = true);
 
 private:
-    bool parseViewBox(Document*, const String&, FloatRect&);
+    static bool parseViewBox(Document*, const String&, FloatRect&);
 };
 

trunk/Source/WebCore/svg/SVGMarkerElement.cpp

@@ -40 +40 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedEnumeration,
+                                             PropertyIsReadWrite,
                                              SVGNames::orientAttr,
                                              orientTypeIdentifier(),
@@ -154 +155 @@
     } else if (SVGLangSpace::parseAttribute(attribute)
              || SVGExternalResourcesRequired::parseAttribute(attribute)
-             || SVGFitToViewBox::parseAttribute(document(), attribute)) {
+             || SVGFitToViewBox::parseAttribute(this, attribute)) {
     } else
         ASSERT_NOT_REACHED();
@@ -240 +241 @@
 
     DEFINE_STATIC_LOCAL(AtomicString, autoString, ("auto"));
-    SVGAnimatedPropertySynchronizer<true>::synchronize(ownerType, orientTypePropertyInfo()->attributeName, autoString);
+    ownerType->m_orientType.synchronize(ownerType, orientTypePropertyInfo()->attributeName, autoString);
 }
 
@@ -247 +248 @@
     ASSERT(contextElement);
     SVGMarkerElement* ownerType = static_cast<SVGMarkerElement*>(contextElement);
-    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGMarkerElement, SVGAnimatedEnumerationPropertyTearOff<SVGMarkerOrientType>, SVGMarkerOrientType, true>
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGMarkerElement, SVGAnimatedEnumerationPropertyTearOff<SVGMarkerOrientType>, SVGMarkerOrientType>
            (ownerType, orientTypePropertyInfo(), ownerType->m_orientType.value);
 }

trunk/Source/WebCore/svg/SVGPathElement.cpp

@@ -53 +53 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedPath,
+                                             PropertyIsReadWrite,
                                              SVGNames::dAttr,
                                              SVGNames::dAttr.localName(),
@@ -262 +263 @@
 
     if (attrName == SVGNames::dAttr) {
-        if (m_pathSegList.shouldSynchronize && !SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, true>(this, dPropertyInfo())->isAnimating()) {
+        if (m_pathSegList.shouldSynchronize && !SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff>(this, dPropertyInfo())->isAnimating()) {
             SVGPathSegList newList(PathSegUnalteredRole);
             buildSVGPathSegListFromByteStream(m_pathByteStream.get(), this, newList, UnalteredParsing);
@@ -278 +279 @@
 SVGPathByteStream* SVGPathElement::pathByteStream() const
 {
-    SVGAnimatedProperty* property = SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, true>(this, dPropertyInfo());
+    SVGAnimatedProperty* property = SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff>(this, dPropertyInfo());
     if (!property || !property->isAnimating())
         return m_pathByteStream.get();
@@ -289 +290 @@
     SVGPathElement* ownerType = static_cast<SVGPathElement*>(contextElement);
 
-    if (SVGAnimatedProperty* property = SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, true>(ownerType, dPropertyInfo()))
+    if (SVGAnimatedProperty* property = SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff>(ownerType, dPropertyInfo()))
         return property;
 
@@ -295 +296 @@
     buildSVGPathSegListFromByteStream(ownerType->m_pathByteStream.get(), ownerType, ownerType->m_pathSegList.value, UnalteredParsing);
 
-    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, SVGPathSegList, true>
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, SVGPathSegList>
            (ownerType, dPropertyInfo(), ownerType->m_pathSegList.value);
 }
@@ -305 +306 @@
     if (!ownerType->m_pathSegList.shouldSynchronize)
         return;
-    SVGAnimatedPropertySynchronizer<true>::synchronize(ownerType, dPropertyInfo()->attributeName, ownerType->m_pathSegList.value.valueAsString());
+    ownerType->m_pathSegList.synchronize(ownerType, dPropertyInfo()->attributeName, ownerType->m_pathSegList.value.valueAsString());
 }
 

trunk/Source/WebCore/svg/SVGPathSegWithContext.h

@@ -40 +40 @@
             return 0;
         case PathSegUnalteredRole:
-            return SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff, true>(m_element.get(), SVGPathElement::dPropertyInfo());
+            return SVGAnimatedProperty::lookupWrapper<SVGPathElement, SVGAnimatedPathSegListPropertyTearOff>(m_element.get(), SVGPathElement::dPropertyInfo());
         case PathSegNormalizedRole:
             // FIXME: https://bugs.webkit.org/show_bug.cgi?id=15412 - Implement normalized path segment lists!

trunk/Source/WebCore/svg/SVGPatternElement.cpp

@@ -35 +35 @@
 #include "RenderSVGResourcePattern.h"
 #include "SVGElementInstance.h"
+#include "SVGFitToViewBox.h"
 #include "SVGNames.h"
 #include "SVGRenderSupport.h"
@@ -144 +145 @@
              || SVGLangSpace::parseAttribute(attribute)
              || SVGExternalResourcesRequired::parseAttribute(attribute)
-             || SVGFitToViewBox::parseAttribute(document(), attribute)) {
+             || SVGFitToViewBox::parseAttribute(this, attribute)) {
     } else
         ASSERT_NOT_REACHED();

trunk/Source/WebCore/svg/SVGPolyElement.cpp

@@ -42 +42 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedPoints,
+                                             PropertyIsReadWrite,
                                              SVGNames::pointsAttr,
                                              SVGNames::pointsAttr.localName(),
@@ -91 +92 @@
             document()->accessSVGExtensions()->reportError("Problem parsing points=\"" + value + "\"");
 
-        if (SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGPolyElement, SVGAnimatedPointList, true>(this, pointsPropertyInfo()))
+        if (SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGPolyElement, SVGAnimatedPointList>(this, pointsPropertyInfo()))
             static_cast<SVGAnimatedPointList*>(wrapper)->detachListWrappers(newList.size());
 
@@ -144 +145 @@
     if (!ownerType->m_points.shouldSynchronize)
         return;
-    SVGAnimatedPropertySynchronizer<true>::synchronize(ownerType, pointsPropertyInfo()->attributeName, ownerType->m_points.value.valueAsString());
+    ownerType->m_points.synchronize(ownerType, pointsPropertyInfo()->attributeName, ownerType->m_points.value.valueAsString());
 }
 
@@ -151 +152 @@
     ASSERT(contextElement);
     SVGPolyElement* ownerType = static_cast<SVGPolyElement*>(contextElement);
-    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGPolyElement, SVGAnimatedPointList, SVGPointList, true>
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGPolyElement, SVGAnimatedPointList, SVGPointList>
            (ownerType, pointsPropertyInfo(), ownerType->m_points.value);
 }

trunk/Source/WebCore/svg/SVGRect.h

@@ -41 +41 @@
         builder.append(' ');
         builder.append(String::number(type.height()));
-        builder.append(' ');
         return builder.toString();
     }

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -47 +47 @@
 #include "SVGAngle.h"
 #include "SVGElementInstance.h"
+#include "SVGFitToViewBox.h"
 #include "SVGNames.h"
 #include "SVGPreserveAspectRatio.h"
@@ -53 +54 @@
 #include "SVGViewElement.h"
 #include "SVGViewSpec.h"
-#include "SVGZoomAndPan.h"
 #include "SVGZoomEvent.h"
 #include "ScriptEventListener.h"
@@ -104 +104 @@
 SVGSVGElement::~SVGSVGElement()
 {
+    if (m_viewSpec)
+        m_viewSpec->resetContextElement();
     document()->unregisterForPageCacheSuspensionCallbacks(this);
     // There are cases where removedFromDocument() is not called.
@@ -171 +173 @@
 }
 
-SVGViewSpec* SVGSVGElement::currentView() const
+SVGViewSpec* SVGSVGElement::currentView()
 {
     if (!m_viewSpec)
-        m_viewSpec = adoptPtr(new SVGViewSpec(const_cast<SVGSVGElement*>(this)));
+        m_viewSpec = SVGViewSpec::create(this);
     return m_viewSpec.get();
 }
@@ -270 +272 @@
                || SVGLangSpace::parseAttribute(attribute)
                || SVGExternalResourcesRequired::parseAttribute(attribute)
-               || SVGFitToViewBox::parseAttribute(document(), attribute)
+               || SVGFitToViewBox::parseAttribute(this, attribute)
                || SVGZoomAndPan::parseAttribute(this, attribute)) {
     } else
@@ -526 +528 @@
 FloatRect SVGSVGElement::currentViewBoxRect() const
 {
-    if (useCurrentView()) {
-        if (SVGViewSpec* view = currentView()) // what if we should use it but it is not set?
-            return view->viewBox();
-        return FloatRect();
-    }
+    if (m_useCurrentView)
+        return m_viewSpec ? m_viewSpec->viewBox() : FloatRect();
 
     FloatRect useViewBox = viewBox();
@@ -647 +646 @@
 AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const
 {
-    AffineTransform ctm = SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(), preserveAspectRatio(), viewWidth, viewHeight);
-    if (useCurrentView() && currentView()) {
-        AffineTransform transform;
-        if (currentView()->transformBaseValue().concatenate(transform))
-            ctm *= transform;
-    }
+    if (!m_useCurrentView || !m_viewSpec)
+        return SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(), preserveAspectRatio(), viewWidth, viewHeight);
+
+    AffineTransform ctm = SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(), m_viewSpec->preserveAspectRatio(), viewWidth, viewHeight);
+    const SVGTransformList& transformList = m_viewSpec->transformBaseValue();
+    if (transformList.isEmpty())
+        return ctm;
+
+    AffineTransform transform;
+    if (transformList.concatenate(transform))
+        ctm *= transform;
 
     return ctm;
@@ -659 +663 @@
 void SVGSVGElement::setupInitialView(const String& fragmentIdentifier, Element* anchorNode)
 {
+    RenderObject* renderer = this->renderer();
+    SVGViewSpec* view = m_viewSpec.get();
+    if (view)
+        view->reset();
+
     bool hadUseCurrentView = m_useCurrentView;
+    m_useCurrentView = false;
+
     if (fragmentIdentifier.startsWith("xpointer(")) {
         // FIXME: XPointer references are ignored (https://bugs.webkit.org/show_bug.cgi?id=17491)
-        setUseCurrentView(false);
-    } else if (fragmentIdentifier.startsWith("svgView(")) {
-        if (currentView()->parseViewSpec(fragmentIdentifier))
-            setUseCurrentView(true);
-    } else if (anchorNode && anchorNode->hasTagName(SVGNames::viewTag)) {
+        if (renderer && hadUseCurrentView)
+            RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
+        return;
+    }
+
+    if (fragmentIdentifier.startsWith("svgView(")) {
+        if (!view)
+            view = currentView(); // Create the SVGViewSpec.
+
+        if (view->parseViewSpec(fragmentIdentifier))
+            m_useCurrentView = true;
+        else
+            view->reset();
+
+        if (renderer && (hadUseCurrentView || m_useCurrentView))
+            RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
+        return;
+    }
+
+    // Spec: If the SVG fragment identifier addresses a ‘view’ element within an SVG document (e.g., MyDrawing.svg#MyView
+    // or MyDrawing.svg#xpointer(id('MyView'))) then the closest ancestor ‘svg’ element is displayed in the viewport.
+    // Any view specification attributes included on the given ‘view’ element override the corresponding view specification
+    // attributes on the closest ancestor ‘svg’ element.
+    if (anchorNode && anchorNode->hasTagName(SVGNames::viewTag)) {
         if (SVGViewElement* viewElement = anchorNode->hasTagName(SVGNames::viewTag) ? static_cast<SVGViewElement*>(anchorNode) : 0) {
             SVGElement* element = SVGLocatable::nearestViewportElement(viewElement);
@@ -672 +702 @@
                 SVGSVGElement* svg = static_cast<SVGSVGElement*>(element);
                 svg->inheritViewAttributes(viewElement);
-                setUseCurrentView(true);
+
+                if (RenderObject* renderer = svg->renderer())
+                    RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
             }
         }
-    }
-
-    if (!hadUseCurrentView) {
-        if (!m_useCurrentView)
-            return;
-    } else if (!m_useCurrentView)
-        currentView()->setTransformString(emptyString());
-
-    // Force a layout, otherwise RenderSVGRoots localToBorderBoxTransform won't be rebuild.
-    if (RenderObject* object = renderer())
-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(object);
+        return;
+    }
 
     // FIXME: We need to decide which <svg> to focus on, and zoom to it.
@@ -693 +716 @@
 void SVGSVGElement::inheritViewAttributes(SVGViewElement* viewElement)
 {
+    SVGViewSpec* view = currentView();
+    m_useCurrentView = true;
+
     if (viewElement->hasAttribute(SVGNames::viewBoxAttr))
-        currentView()->setViewBoxBaseValue(viewElement->viewBox());
+        view->setViewBoxBaseValue(viewElement->viewBox());
     else
-        currentView()->setViewBoxBaseValue(viewBox());
-
-    SVGPreserveAspectRatio aspectRatio;
+        view->setViewBoxBaseValue(viewBox());
+
     if (viewElement->hasAttribute(SVGNames::preserveAspectRatioAttr))
-        aspectRatio = viewElement->preserveAspectRatioBaseValue();
+        view->setPreserveAspectRatioBaseValue(viewElement->preserveAspectRatioBaseValue());
     else
-        aspectRatio = preserveAspectRatioBaseValue();
-    currentView()->setPreserveAspectRatioBaseValue(aspectRatio);
+        view->setPreserveAspectRatioBaseValue(preserveAspectRatioBaseValue());
 
     if (viewElement->hasAttribute(SVGNames::zoomAndPanAttr))
-        currentView()->setZoomAndPanBaseValue(viewElement->zoomAndPan());
-    
-    if (RenderObject* object = renderer())
-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(object);
-}
-    
+        view->setZoomAndPanBaseValue(viewElement->zoomAndPan());
+    else
+        view->setZoomAndPanBaseValue(zoomAndPan());
+}
+
 void SVGSVGElement::documentWillSuspendForPageCache()
 {

trunk/Source/WebCore/svg/SVGSVGElement.h

@@ -73 +73 @@
 
     bool useCurrentView() const { return m_useCurrentView; }
-    void setUseCurrentView(bool currentView) { m_useCurrentView = currentView; }
-
-    SVGViewSpec* currentView() const;
+    SVGViewSpec* currentView();
 
     enum ConsiderCSSMode {
@@ -192 +190 @@
     RefPtr<SMILTimeContainer> m_timeContainer;
     FloatPoint m_translation;
-    mutable OwnPtr<SVGViewSpec> m_viewSpec;
+    RefPtr<SVGViewSpec> m_viewSpec;
 };
 

trunk/Source/WebCore/svg/SVGSVGElement.idl

@@ -49 +49 @@
         readonly attribute float screenPixelToMillimeterX;
         readonly attribute float screenPixelToMillimeterY;
-                 attribute boolean useCurrentView
-                     /*setter raises(DOMException)*/;
-        // TODO    readonly attribute SVGViewSpec currentView;
+        readonly attribute boolean useCurrentView;
+        readonly attribute SVGViewSpec currentView;
                  attribute float currentScale
                      /*setter raises(DOMException)*/;

trunk/Source/WebCore/svg/SVGSymbolElement.cpp

@@ -77 +77 @@
     if (SVGExternalResourcesRequired::parseAttribute(attribute))
         return;
-    if (SVGFitToViewBox::parseAttribute(document(), attribute))
+    if (SVGFitToViewBox::parseAttribute(this, attribute))
         return;
 

trunk/Source/WebCore/svg/SVGTests.cpp

@@ -39 +39 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedUnknown,
+                                             PropertyIsReadWrite,
                                              SVGNames::requiredFeaturesAttr,
                                              SVGNames::requiredFeaturesAttr.localName(),
@@ -53 +54 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedUnknown,
+                                             PropertyIsReadWrite,
                                              SVGNames::requiredExtensionsAttr,
                                              SVGNames::requiredExtensionsAttr.localName(),
@@ -67 +69 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedUnknown,
+                                             PropertyIsReadWrite,
                                              SVGNames::systemLanguageAttr,
                                              SVGNames::systemLanguageAttr.localName(),
@@ -174 +177 @@
         return;
     AtomicString value(m_requiredFeatures.value.valueAsString());
-    SVGAnimatedPropertySynchronizer<true>::synchronize(contextElement, requiredFeaturesPropertyInfo()->attributeName, value);
+    m_requiredFeatures.synchronize(contextElement, requiredFeaturesPropertyInfo()->attributeName, value);
 }
 
@@ -183 +186 @@
         return;
     AtomicString value(m_requiredExtensions.value.valueAsString());
-    SVGAnimatedPropertySynchronizer<true>::synchronize(contextElement, requiredExtensionsPropertyInfo()->attributeName, value);
+    m_requiredExtensions.synchronize(contextElement, requiredExtensionsPropertyInfo()->attributeName, value);
 }
 
@@ -192 +195 @@
         return;
     AtomicString value(m_systemLanguage.value.valueAsString());
-    SVGAnimatedPropertySynchronizer<true>::synchronize(contextElement, systemLanguagePropertyInfo()->attributeName, value);
+    m_systemLanguage.synchronize(contextElement, systemLanguagePropertyInfo()->attributeName, value);
 }
 

trunk/Source/WebCore/svg/SVGTextContentElement.cpp

@@ -45 +45 @@
     if (!s_propertyInfo) {
         s_propertyInfo = new SVGPropertyInfo(AnimatedLength,
+                                             PropertyIsReadWrite,
                                              SVGNames::textLengthAttr,
                                              SVGNames::textLengthAttr.localName(),
@@ -81 +82 @@
         return;
     AtomicString value(SVGPropertyTraits<SVGLength>::toString(ownerType->m_specifiedTextLength));
-    SVGAnimatedPropertySynchronizer<true>::synchronize(ownerType, textLengthPropertyInfo()->attributeName, value);
+    ownerType->m_textLength.synchronize(ownerType, textLengthPropertyInfo()->attributeName, value);
 }
 
@@ -88 +89 @@
     ASSERT(contextElement);
     SVGTextContentElement* ownerType = static_cast<SVGTextContentElement*>(contextElement);
-    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGTextContentElement, SVGAnimatedLength, SVGLength, true>
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGTextContentElement, SVGAnimatedLength, SVGLength>
            (ownerType, textLengthPropertyInfo(), ownerType->m_textLength.value);
 }

trunk/Source/WebCore/svg/SVGViewElement.cpp

@@ -84 +84 @@
     if (SVGExternalResourcesRequired::parseAttribute(attribute))
         return;
-    if (SVGFitToViewBox::parseAttribute(document(), attribute))
+    if (SVGFitToViewBox::parseAttribute(this, attribute))
         return;
     if (SVGZoomAndPan::parseAttribute(this, attribute))

trunk/Source/WebCore/svg/SVGViewElement.h

@@ -45 +45 @@
 
     SVGStringList& viewTarget() { return m_viewTarget; }
-
     SVGZoomAndPanType zoomAndPan() const { return m_zoomAndPan; }
     void setZoomAndPan(unsigned short zoomAndPan) { m_zoomAndPan = SVGZoomAndPan::parseFromNumber(zoomAndPan); }

trunk/Source/WebCore/svg/SVGViewSpec.cpp

@@ -24 +24 @@
 
 #include "Document.h"
+#include "SVGAnimatedTransformList.h"
+#include "SVGFitToViewBox.h"
 #include "SVGNames.h"
 #include "SVGParserUtilities.h"
@@ -31 +33 @@
 namespace WebCore {
 
-// Animated property definitions
-DEFINE_ANIMATED_RECT(SVGViewSpec, SVGNames::viewBoxAttr, ViewBox, viewBox)
-DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGViewSpec, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio)
-
-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGViewSpec)
-    REGISTER_LOCAL_ANIMATED_PROPERTY(viewBox)
-    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio)
-END_REGISTER_ANIMATED_PROPERTIES
+// Define custom animated property 'viewBox'.
+const SVGPropertyInfo* SVGViewSpec::viewBoxPropertyInfo()
+{
+    static const SVGPropertyInfo* s_propertyInfo = 0;
+    if (!s_propertyInfo) {
+        s_propertyInfo = new SVGPropertyInfo(AnimatedRect,
+                                             PropertyIsReadOnly,
+                                             SVGNames::viewBoxAttr,
+                                             viewBoxIdentifier(),
+                                             0,
+                                             &SVGViewSpec::lookupOrCreateViewBoxWrapper);
+    }
+    return s_propertyInfo;
+}
+
+// Define custom animated property 'preserveAspectRatio'.
+const SVGPropertyInfo* SVGViewSpec::preserveAspectRatioPropertyInfo()
+{
+    static const SVGPropertyInfo* s_propertyInfo = 0;
+    if (!s_propertyInfo) {
+        s_propertyInfo = new SVGPropertyInfo(AnimatedPreserveAspectRatio,
+                                             PropertyIsReadOnly,
+                                             SVGNames::preserveAspectRatioAttr,
+                                             preserveAspectRatioIdentifier(),
+                                             0,
+                                             &SVGViewSpec::lookupOrCreatePreserveAspectRatioWrapper);
+    }
+    return s_propertyInfo;
+}
+
+
+// Define custom non-animated property 'transform'.
+const SVGPropertyInfo* SVGViewSpec::transformPropertyInfo()
+{
+    static const SVGPropertyInfo* s_propertyInfo = 0;
+    if (!s_propertyInfo) {
+        s_propertyInfo = new SVGPropertyInfo(AnimatedTransformList,
+                                             PropertyIsReadOnly,
+                                             SVGNames::transformAttr,
+                                             transformIdentifier(),
+                                             0,
+                                             &SVGViewSpec::lookupOrCreateTransformWrapper);
+    }
+    return s_propertyInfo;
+}
 
 SVGViewSpec::SVGViewSpec(SVGElement* contextElement)
@@ -45 +84 @@
 {
     ASSERT(m_contextElement);
-    registerAnimatedPropertiesForSVGViewSpec();
+}
+
+const AtomicString& SVGViewSpec::viewBoxIdentifier()
+{
+    DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecViewBoxAttribute"));
+    return s_identifier;
+}
+
+const AtomicString& SVGViewSpec::preserveAspectRatioIdentifier()
+{
+    DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecPreserveAspectRatioAttribute"));
+    return s_identifier;
+}
+
+const AtomicString& SVGViewSpec::transformIdentifier()
+{
+    DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecTransformAttribute"));
+    return s_identifier;
+}
+
+void SVGViewSpec::setZoomAndPan(unsigned short, ExceptionCode& ec)
+{
+    // SVGViewSpec and all of its content is read-only.
+    ec = NO_MODIFICATION_ALLOWED_ERR;
 }
 
 void SVGViewSpec::setTransformString(const String& transform)
 {
-    m_transform.parse(transform);
-}
-
-void SVGViewSpec::setViewBoxString(const String& viewBoxStr)
-{
-    FloatRect viewBox;
-    const UChar* c = viewBoxStr.characters();
-    const UChar* end = c + viewBoxStr.length();
-    if (!parseViewBox(m_contextElement->document(), c, end, viewBox, false))
-         return;
-    setViewBoxBaseValue(viewBox);
+    if (!m_contextElement)
+        return;
+
+    SVGTransformList newList;
+    newList.parse(transform);
+
+    if (SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGElement, SVGAnimatedTransformList>(m_contextElement, transformPropertyInfo()))
+        static_cast<SVGAnimatedTransformList*>(wrapper)->detachListWrappers(newList.size());
+
+    m_transform = newList;
+}
+
+String SVGViewSpec::transformString() const
+{
+    return SVGPropertyTraits<SVGTransformList>::toString(m_transform);
+}
+
+String SVGViewSpec::viewBoxString() const
+{
+    return SVGPropertyTraits<FloatRect>::toString(viewBoxBaseValue());
 }
 
@@ -70 +141 @@
 }
 
-void SVGViewSpec::setViewTargetString(const String& viewTargetString)
-{
-    m_viewTargetString = viewTargetString;
+String SVGViewSpec::preserveAspectRatioString() const
+{
+    return SVGPropertyTraits<SVGPreserveAspectRatio>::toString(preserveAspectRatioBaseValue());
 }
 
 SVGElement* SVGViewSpec::viewTarget() const
 {
+    if (!m_contextElement)
+        return 0;
     return static_cast<SVGElement*>(m_contextElement->treeScope()->getElementById(m_viewTargetString));
+}
+
+SVGTransformListPropertyTearOff* SVGViewSpec::transform()
+{
+    // Return the animVal here, as its readonly by default - which is exactly what we want here.
+    return static_cast<SVGTransformListPropertyTearOff*>(static_pointer_cast<SVGAnimatedTransformList>(lookupOrCreateTransformWrapper(this))->animVal());
+}
+
+PassRefPtr<SVGAnimatedProperty> SVGViewSpec::lookupOrCreateViewBoxWrapper(void* maskedOwnerType)
+{
+    ASSERT(maskedOwnerType);
+    SVGViewSpec* ownerType = static_cast<SVGViewSpec*>(maskedOwnerType);
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGElement, SVGAnimatedRect, FloatRect>(ownerType->contextElement(), viewBoxPropertyInfo(), ownerType->m_viewBox);
+}
+
+PassRefPtr<SVGAnimatedProperty> SVGViewSpec::lookupOrCreatePreserveAspectRatioWrapper(void* maskedOwnerType)
+{
+    ASSERT(maskedOwnerType);
+    SVGViewSpec* ownerType = static_cast<SVGViewSpec*>(maskedOwnerType);
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGElement, SVGAnimatedPreserveAspectRatio, SVGPreserveAspectRatio>(ownerType->contextElement(), preserveAspectRatioPropertyInfo(), ownerType->m_preserveAspectRatio);
+}
+
+PassRefPtr<SVGAnimatedProperty> SVGViewSpec::lookupOrCreateTransformWrapper(void* maskedOwnerType)
+{
+    ASSERT(maskedOwnerType);
+    SVGViewSpec* ownerType = static_cast<SVGViewSpec*>(maskedOwnerType);
+    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGElement, SVGAnimatedTransformList, SVGTransformList>(ownerType->contextElement(), transformPropertyInfo(), ownerType->m_transform);
+}
+
+void SVGViewSpec::reset()
+{
+    m_zoomAndPan = SVGZoomAndPanMagnify;
+    m_transform.clear();
+    m_viewBox = FloatRect();
+    m_preserveAspectRatio = SVGPreserveAspectRatio();
+    m_viewTargetString = emptyString();
 }
 
@@ -92 +201 @@
     const UChar* end = currViewSpec + viewSpec.length();
 
-    if (currViewSpec >= end)
+    if (currViewSpec >= end || !m_contextElement)
         return false;
 
@@ -109 +218 @@
                 currViewSpec++;
                 FloatRect viewBox;
-                if (!parseViewBox(m_contextElement->document(), currViewSpec, end, viewBox, false))
+                if (!SVGFitToViewBox::parseViewBox(m_contextElement->document(), currViewSpec, end, viewBox, false))
                     return false;
                 setViewBoxBaseValue(viewBox);

trunk/Source/WebCore/svg/SVGViewSpec.h

@@ -31 +31 @@
 
 class SVGElement;
+class SVGTransformListPropertyTearOff;
 
-class SVGViewSpec : public SVGZoomAndPan,
-                    public SVGFitToViewBox {
-    WTF_MAKE_NONCOPYABLE(SVGViewSpec);
+class SVGViewSpec : public RefCounted<SVGViewSpec>
+                  , public SVGZoomAndPan
+                  , public SVGFitToViewBox {
 public:
-    SVGViewSpec(SVGElement*);
+    virtual ~SVGViewSpec() { }
+
+    using RefCounted<SVGViewSpec>::ref;
+    using RefCounted<SVGViewSpec>::deref;
+
+    static PassRefPtr<SVGViewSpec> create(SVGElement* contextElement)
+    {
+        return adoptRef(new SVGViewSpec(contextElement));
+    }
 
     bool parseViewSpec(const String&);
+    void reset();
+
+    SVGElement* viewTarget() const;
+    String viewBoxString() const;
+
+    void setPreserveAspectRatioString(const String&);
+    String preserveAspectRatioString() const;
 
     void setTransformString(const String&);
-    SVGTransformList transform() const { return m_transform; }
-    SVGTransformList transformBaseValue() const { return m_transform; }
+    String transformString() const;
 
-    void setViewBoxString(const String&);
-
-    void setPreserveAspectRatioString(const String&);
-
-    void setViewTargetString(const String&);
+    void setViewTargetString(const String& string) { m_viewTargetString = string; }
     String viewTargetString() const { return m_viewTargetString; }
-    SVGElement* viewTarget() const;
 
     SVGZoomAndPanType zoomAndPan() const { return m_zoomAndPan; }
+    void setZoomAndPan(unsigned short zoomAndPan) { setZoomAndPanBaseValue(zoomAndPan); }
     void setZoomAndPan(unsigned short, ExceptionCode&);
     void setZoomAndPanBaseValue(unsigned short zoomAndPan) { m_zoomAndPan = SVGZoomAndPan::parseFromNumber(zoomAndPan); }
 
+    SVGElement* contextElement() const { return m_contextElement; }
+    void resetContextElement() { m_contextElement = 0; }
+
+    // Custom non-animated 'transform' property.
+    SVGTransformListPropertyTearOff* transform();
+    SVGTransformList transformBaseValue() const { return m_transform; }
+
+    // Custom animated 'viewBox' property.
+    PassRefPtr<SVGAnimatedRect> viewBoxAnimated()
+    {
+        return static_pointer_cast<SVGAnimatedRect>(lookupOrCreateViewBoxWrapper(this));
+    }
+
+    FloatRect& viewBox() { return m_viewBox; }
+    FloatRect viewBoxBaseValue() const { return m_viewBox; }
+    void setViewBoxBaseValue(const FloatRect& viewBox) { m_viewBox = viewBox; }
+
+    // Custom animated 'preserveAspectRatio' property.
+    PassRefPtr<SVGAnimatedPreserveAspectRatio> preserveAspectRatioAnimated()
+    {
+        return static_pointer_cast<SVGAnimatedPreserveAspectRatio>(lookupOrCreatePreserveAspectRatioWrapper(this));
+    }
+
+    SVGPreserveAspectRatio& preserveAspectRatio() { return m_preserveAspectRatio; }
+    SVGPreserveAspectRatio preserveAspectRatioBaseValue() const { return m_preserveAspectRatio; }
+    void setPreserveAspectRatioBaseValue(const SVGPreserveAspectRatio& preserveAspectRatio) { m_preserveAspectRatio = preserveAspectRatio; }
+
 private:
+    SVGViewSpec(SVGElement*);
+
+    static const SVGPropertyInfo* transformPropertyInfo();
+    static const SVGPropertyInfo* viewBoxPropertyInfo();
+    static const SVGPropertyInfo* preserveAspectRatioPropertyInfo();
+
+    static const AtomicString& transformIdentifier();
+    static const AtomicString& viewBoxIdentifier();
+    static const AtomicString& preserveAspectRatioIdentifier();
+
+    static PassRefPtr<SVGAnimatedProperty> lookupOrCreateTransformWrapper(void* contextElement);
+    static PassRefPtr<SVGAnimatedProperty> lookupOrCreateViewBoxWrapper(void* contextElement);
+    static PassRefPtr<SVGAnimatedProperty> lookupOrCreatePreserveAspectRatioWrapper(void* contextElement);
+
     SVGElement* m_contextElement;
-
-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGViewSpec)
-        DECLARE_ANIMATED_RECT(ViewBox, viewBox)
-        DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
-    END_DECLARE_ANIMATED_PROPERTIES
+    SVGZoomAndPanType m_zoomAndPan;
 
     SVGTransformList m_transform;
+    FloatRect m_viewBox;
+    SVGPreserveAspectRatio m_preserveAspectRatio;
     String m_viewTargetString;
-    SVGZoomAndPanType m_zoomAndPan;
 };
 

trunk/Source/WebCore/svg/SVGViewSpec.idl

@@ -26 +26 @@
 module svg {
 
+    // SVGViewSpec intentionally doesn't inherit from SVGZoomAndPan & SVGFitToViewBox on the IDLs.
+    // It would require that any of those classes would be RefCounted, and we want to avoid that.
     interface [
-        Conditional=SVG
-    ] SVGViewSpec : SVGZoomAndPan, SVGFitToViewBox
-    {
+        Conditional=SVG,
+        JSGenerateToJSObject
+    ] SVGViewSpec {
           readonly attribute SVGTransformList transform;
-          readonly attribute SVGElement       viewTarget;
-          readonly attribute DOMString        viewBoxString;
-          readonly attribute DOMString        preserveAspectRatioString;
-          readonly attribute DOMString        transformString;
-          readonly attribute DOMString        viewTargetString;
+          readonly attribute SVGElement viewTarget;
+          readonly attribute DOMString viewBoxString;
+          readonly attribute DOMString preserveAspectRatioString;
+          readonly attribute DOMString transformString;
+          readonly attribute DOMString viewTargetString;
+
+          // SVGZoomAndPan
+          attribute unsigned short zoomAndPan
+              setter raises(DOMException);
+
+          // SVGFitToViewBox
+          readonly attribute SVGAnimatedRect viewBox;
+          readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
     };
 

trunk/Source/WebCore/svg/properties/SVGAnimatedProperty.h

@@ -37 +37 @@
     AnimatedPropertyType animatedPropertyType() const { return m_animatedPropertyType; }
     bool isAnimating() const { return m_isAnimating; }
+    bool isReadOnly() const { return m_isReadOnly; }
+    void setIsReadOnly() { m_isReadOnly = true; }
 
     void commitChange()
@@ -67 +69 @@
     }
 
-    // lookupOrCreateWrapper & helper methods.
-    template<typename TearOffType, typename PropertyType, bool isDerivedFromSVGElement>
-    struct LookupOrCreateHelper;
-
-    template<typename TearOffType, typename PropertyType>
-    struct LookupOrCreateHelper<TearOffType, PropertyType, false> {
-        static PassRefPtr<TearOffType> lookupOrCreateWrapper(void*, const SVGPropertyInfo*, PropertyType&)
-        {
-            ASSERT_NOT_REACHED();
-            return PassRefPtr<TearOffType>();
-        }
-    };
-
-    template<typename TearOffType, typename PropertyType>
-    struct LookupOrCreateHelper<TearOffType, PropertyType, true> {
-        static PassRefPtr<TearOffType> lookupOrCreateWrapper(SVGElement* element, const SVGPropertyInfo* info, PropertyType& property)
-        {
-            ASSERT(info);
-            SVGAnimatedPropertyDescription key(element, info->propertyIdentifier);
-            RefPtr<SVGAnimatedProperty> wrapper = animatedPropertyCache()->get(key);
-            if (!wrapper) {
-                wrapper = TearOffType::create(element, info->attributeName, info->animatedPropertyType, property);
-                animatedPropertyCache()->set(key, wrapper.get());
-            }
-            return static_pointer_cast<TearOffType>(wrapper);
-        }
-    };
-
-    template<typename OwnerType, typename TearOffType, typename PropertyType, bool isDerivedFromSVGElement>
+    template<typename OwnerType, typename TearOffType, typename PropertyType>
     static PassRefPtr<TearOffType> lookupOrCreateWrapper(OwnerType* element, const SVGPropertyInfo* info, PropertyType& property)
     {
-        return LookupOrCreateHelper<TearOffType, PropertyType, isDerivedFromSVGElement>::lookupOrCreateWrapper(element, info, property);
+        ASSERT(info);
+        SVGAnimatedPropertyDescription key(element, info->propertyIdentifier);
+        RefPtr<SVGAnimatedProperty> wrapper = animatedPropertyCache()->get(key);
+        if (!wrapper) {
+            wrapper = TearOffType::create(element, info->attributeName, info->animatedPropertyType, property);
+            if (info->animatedPropertyState == PropertyIsReadOnly)
+                wrapper->setIsReadOnly();
+            animatedPropertyCache()->set(key, wrapper.get());
+        }
+        return static_pointer_cast<TearOffType>(wrapper);
     }
 
-    // lookupWrapper & helper methods.
-    template<typename TearOffType, bool isDerivedFromSVGElement>
-    struct LookupHelper;
+    template<typename OwnerType, typename TearOffType>
+    static TearOffType* lookupWrapper(OwnerType* element, const SVGPropertyInfo* info)
+    {
+        ASSERT(info);
+        SVGAnimatedPropertyDescription key(element, info->propertyIdentifier);
+        return static_cast<TearOffType*>(animatedPropertyCache()->get(key));
+    }
 
-    template<typename TearOffType>
-    struct LookupHelper<TearOffType, false> {
-        static TearOffType* lookupWrapper(const void*, const SVGPropertyInfo*)
-        {
-            return 0;
-        }
-    };
-
-    template<typename TearOffType>
-    struct LookupHelper<TearOffType, true> {
-        static TearOffType* lookupWrapper(const SVGElement* element, const SVGPropertyInfo* info)
-        {
-            ASSERT(info);
-            SVGAnimatedPropertyDescription key(const_cast<SVGElement*>(element), info->propertyIdentifier);
-            return static_cast<TearOffType*>(animatedPropertyCache()->get(key));
-        }
-    };
-
-    template<typename OwnerType, typename TearOffType, bool isDerivedFromSVGElement>
+    template<typename OwnerType, typename TearOffType>
     static TearOffType* lookupWrapper(const OwnerType* element, const SVGPropertyInfo* info)
     {
-        return LookupHelper<TearOffType, isDerivedFromSVGElement>::lookupWrapper(element, info);
+        return lookupWrapper<OwnerType, TearOffType>(const_cast<OwnerType*>(element), info);
     }
 
@@ -135 +104 @@
         , m_animatedPropertyType(animatedPropertyType)
         , m_isAnimating(false)
+        , m_isReadOnly(false)
     {
     }
@@ -151 +121 @@
 protected:
     bool m_isAnimating;
+    bool m_isReadOnly;
 };
 

trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h

@@ -24 +24 @@
 
 #if ENABLE(SVG)
+#include "SVGAnimatedProperty.h"
 #include "SVGAttributeToPropertyMap.h"
 #include "SVGPropertyTraits.h"
@@ -29 +30 @@
 
 namespace WebCore {
-
-// IsDerivedFromSVGElement implementation
-template<typename OwnerType>
-struct IsDerivedFromSVGElement {
-    static const bool value = true;
-};
-
-class SVGTests;
-template<>
-struct IsDerivedFromSVGElement<SVGTests> {
-    static const bool value = false;
-};
-
-class SVGViewSpec;
-template<>
-struct IsDerivedFromSVGElement<SVGViewSpec> {
-    static const bool value = false;
-};
 
 // SVGSynchronizableAnimatedProperty implementation
@@ -69 +52 @@
         , shouldSynchronize(false)
     {
+    }
+
+    void synchronize(SVGElement* ownerElement, const QualifiedName& attrName, const AtomicString& value)
+    {
+        // If the attribute already exists on the element, we change the
+        // Attribute directly to avoid a call to Element::attributeChanged
+        // that could cause the SVGElement to erroneously reset its properties.
+        // svg/dom/SVGStringList-basics.xhtml exercises this behavior.
+        ElementAttributeData* attributeData = ownerElement->ensureUpdatedAttributeData();
+        Attribute* old = attributeData->getAttributeItem(attrName);
+        if (old && value.isNull())
+            attributeData->removeAttribute(old->name(), ownerElement);
+        else if (!old && !value.isNull())
+            attributeData->addAttribute(Attribute(attrName, value), ownerElement);
+        else if (old && !value.isNull())
+            old->setValue(value);
     }
 
@@ -103 +102 @@
     DEFINE_STATIC_LOCAL(const SVGPropertyInfo, s_propertyInfo, \
                         (AnimatedPropertyTypeEnum, \
+                         PropertyIsReadWrite, \
                          DOMAttribute, \
                          SVGDOMAttributeIdentifier, \
@@ -125 +125 @@
     PropertyType& LowerProperty() const \
     { \
-        if (TearOffType* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, TearOffType, IsDerivedFromSVGElement<UseOwnerType>::value>(this, LowerProperty##PropertyInfo())) { \
+        if (TearOffType* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, TearOffType>(this, LowerProperty##PropertyInfo())) { \
             if (wrapper->isAnimating()) \
                 return wrapper->currentAnimatedValue(); \
@@ -154 +154 @@
             return; \
         AtomicString value(SVGPropertyTraits<PropertyType>::toString(m_##LowerProperty.value)); \
-        SVGAnimatedPropertySynchronizer<IsDerivedFromSVGElement<UseOwnerType>::value>::synchronize(this, LowerProperty##PropertyInfo()->attributeName, value); \
+        m_##LowerProperty.synchronize(this, LowerProperty##PropertyInfo()->attributeName, value); \
     } \
 \
@@ -161 +161 @@
         ASSERT(maskedOwnerType); \
         UseOwnerType* ownerType = static_cast<UseOwnerType*>(maskedOwnerType); \
-        return SVGAnimatedProperty::lookupOrCreateWrapper<UseOwnerType, TearOffType, PropertyType, IsDerivedFromSVGElement<UseOwnerType>::value>(ownerType, LowerProperty##PropertyInfo(), ownerType->m_##LowerProperty.value); \
+        return SVGAnimatedProperty::lookupOrCreateWrapper<UseOwnerType, TearOffType, PropertyType>(ownerType, LowerProperty##PropertyInfo(), ownerType->m_##LowerProperty.value); \
     } \
 \
@@ -180 +180 @@
 void detachAnimated##UpperProperty##ListWrappers(unsigned newListSize) \
 { \
-    if (TearOffType* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, TearOffType, IsDerivedFromSVGElement<UseOwnerType>::value>(this, LowerProperty##PropertyInfo())) \
+    if (TearOffType* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, TearOffType>(this, LowerProperty##PropertyInfo())) \
         wrapper->detachListWrappers(newListSize); \
 }

trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h

@@ -22 +22 @@
 
 #if ENABLE(SVG)
-#include "QualifiedName.h"
-#include "SVGAnimatedPropertySynchronizer.h"
+#include "SVGPropertyInfo.h"
 #include <wtf/HashMap.h>
 
@@ -30 +29 @@
 class SVGAnimatedProperty;
 class SVGElement;
-struct SVGPropertyInfo;
 
 class SVGAttributeToPropertyMap {

trunk/Source/WebCore/svg/properties/SVGListProperty.h

@@ -416 +416 @@
     }
 
-    virtual SVGPropertyRole role() const { return m_role; }
-
     PropertyType& values()
     {

trunk/Source/WebCore/svg/properties/SVGListPropertyTearOff.h

@@ -38 +38 @@
     typedef typename SVGAnimatedListPropertyTearOff<PropertyType>::ListWrapperCache ListWrapperCache;
 
+    using Base::m_role;
     using Base::m_values;
     using Base::m_wrappers;
@@ -116 +117 @@
     }
 
+    virtual bool isReadOnly() const
+    {
+        if (m_role == AnimValRole)
+            return true;
+        if (m_animatedProperty && m_animatedProperty->isReadOnly())
+            return true;
+        return false;
+    }
+
     virtual void commitChange()
     {

trunk/Source/WebCore/svg/properties/SVGPathSegListPropertyTearOff.h

@@ -127 +127 @@
     SVGPathElement* contextElement() const;
 
+    using Base::m_role;
+
+    virtual bool isReadOnly() const
+    {
+        if (m_role == AnimValRole)
+            return true;
+        if (m_animatedProperty && m_animatedProperty->isReadOnly())
+            return true;
+        return false;
+    }
+
     virtual void commitChange()
     {

trunk/Source/WebCore/svg/properties/SVGProperty.h

@@ -36 +36 @@
     virtual ~SVGProperty() { }
 
-    virtual SVGPropertyRole role() const = 0;
+    virtual bool isReadOnly() const = 0;
     virtual void commitChange() = 0;
 };

trunk/Source/WebCore/svg/properties/SVGPropertyInfo.h

@@ -29 +29 @@
 class SVGAnimatedProperty;
 
+enum AnimatedPropertyState {
+    PropertyIsReadWrite,
+    PropertyIsReadOnly
+};
+
 enum AnimatedPropertyType {
     AnimatedAngle,
@@ -54 +59 @@
     typedef PassRefPtr<SVGAnimatedProperty> (*LookupOrCreateWrapperForAnimatedProperty)(void*);
 
-    SVGPropertyInfo(AnimatedPropertyType newType, const QualifiedName& newAttributeName,
+    SVGPropertyInfo(AnimatedPropertyType newType, AnimatedPropertyState newState, const QualifiedName& newAttributeName,
                     const AtomicString& newPropertyIdentifier, SynchronizeProperty newSynchronizeProperty,
                     LookupOrCreateWrapperForAnimatedProperty newLookupOrCreateWrapperForAnimatedProperty)
         : animatedPropertyType(newType)
+        , animatedPropertyState(newState)
         , attributeName(newAttributeName)
         , propertyIdentifier(newPropertyIdentifier)
@@ -66 +72 @@
 
     AnimatedPropertyType animatedPropertyType;
+    AnimatedPropertyState animatedPropertyState;
     const QualifiedName& attributeName;
     const AtomicString& propertyIdentifier;

trunk/Source/WebCore/svg/properties/SVGPropertyTearOff.h

@@ -97 +97 @@
     }
 
-    virtual SVGPropertyRole role() const { return m_role; }
+    virtual bool isReadOnly() const
+    {
+        if (m_role == AnimValRole)
+            return true;
+        if (m_animatedProperty && m_animatedProperty->isReadOnly())
+            return true;
+        return false;
+    }
 
 protected:

trunk/Source/WebCore/svg/properties/SVGStaticListPropertyTearOff.h

@@ -34 +34 @@
     typedef SVGPropertyTearOff<ListItemType> ListItemTearOff;
 
+    using Base::m_role;
     using Base::m_values;
 
@@ -85 +86 @@
     }
 
+    virtual bool isReadOnly() const
+    {
+        return m_role == AnimValRole;
+    }
+
     virtual void commitChange()
     {

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-05-29  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        SVGViewSpec DOM bindings aka SVGSVGElement.currentView is unimplemented
+        https://bugs.webkit.org/show_bug.cgi?id=15495
+
+        Reviewed by Rob Buis.
+
+        * MigrateHeaders.make: Copy DOMSVGViewSpec*.h headers.
+
 2012-05-25  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/Source/WebKit/mac/MigrateHeaders.make

@@ -464 +464 @@
     $(PRIVATE_HEADERS_DIR)/DOMSVGViewElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMSVGViewElementInternal.h \
+    $(PRIVATE_HEADERS_DIR)/DOMSVGViewSpec.h \
+    $(INTERNAL_HEADERS_DIR)/DOMSVGViewSpecInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGZoomAndPan.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGZoomEvent.h \