Changeset 243730 in webkit

Timestamp:

Apr 1, 2019 6:31:54 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove the SVG tear off objects for SVGMatrix, SVGTransfrom, SVGTransformList and SVGAnimatedTransformList
​https://bugs.webkit.org/show_bug.cgi?id=196086

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-04-01
Reviewed by Simon Fraser.

Source/WebCore:

The IDL changes:

SVGTransform.idl:

Remove the NewObject qualifier from matrix attribute. This matches
the specs: ​https://www.w3.org/TR/SVG11/coords.html#InterfaceSVGTransform.
SVGTransform will internally hold an SVGMatrix. A change in this
SVGMatrix will affect the container SVGTransform.

SVGTransformList.idl:

Remove the NewObject qualifier from consolidate() method. This matches
the specs:
​https://www.w3.org/TR/SVG11/coords.html#__svg__SVGTransformList__consolidate
The method consolidate() should return a reference to the first item
in the list after consolidating it.

Code changes:

-- SVGMatrix is now a superclass of SVGValueProperty<AffineTransform>.

No need for SVGMatrixValue since it was wrapper of AffineTransform.

-- SVGTransformValue now holds a Ref<SVGMatrix> member in addition to the

angle and the rotationCenter. Ref<SVGMatrix> is what SVGTransform.matrix
will return. So a change in this matrix will change the owner SVGTransform.

-- SVGTransform is now the owner of SVGMatrix via its SVGTransformValue.

-- SVGTransformList is now a superclass of SVGValuePropertyList<SVGTransform>.

It is responsible for parsing a String to items of SVGTransform.

-- SVGAnimatedTransformList is now defined as SVGAnimatedPropertyList<

SVGTransformList>.

Note the ownership chain of these objects is the following:

-- SVGAnimatedTransformList owns the SVGTransformList via its baseVal

and animVal members.

-- SVGTransformList owns SVGTransform via its list of items

-- SVGTransform owns SVGMatrix via its SVGTransformValue.

So a change in SVGMatrix will propagate to the owner SVGElement through
the following ownership chain:

SVGMatrix

|_ SVGTransfrom

|_ SVGTransformList

|_ SVGAmimatedTransformList

|_ SVGElement

To get the mechanics of this change right, a new accessor, a new animator
and animation functions are added for the SVGAnimatedTransformList.

-- SVGViewSpec used to hold an SVGAnimatedTransformListAttribute for the
member m_transform although this member should not be animated. See the
comment in the old SVGViewSpec::transform(). This has been changed in this
patch. SVGViewSpec now holds Ref<SVGTransformList> which matches the specs:
​https://www.w3.org/TR/SVG11/types.html#InterfaceSVGViewSpec.

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• svg/SVGAnimateElementBase.cpp:

(WebCore::SVGAnimateElementBase::attributeAnimationController):
(WebCore::SVGAnimateElementBase::hasValidAttributeType const):
(WebCore::SVGAnimateElementBase::calculateToAtEndOfDurationValue):
(WebCore::SVGAnimateElementBase::calculateFromAndToValues):
(WebCore::SVGAnimateElementBase::calculateFromAndByValues):

• svg/SVGAnimateElementBase.h:

(WebCore::SVGAnimateElementBase::animateRangeString const):

• svg/SVGAnimateTransformElement.cpp:

(WebCore::SVGAnimateTransformElement::animateRangeString const):

• svg/SVGAnimateTransformElement.h:

This change is needed because animating the transform attribute can be

written as

<animate ... from="translate(100)" to="translate(200)"/>

or

<animateTransform type="translate" from="100" to="200"/>"

So we need to surround the animation range string with the type qualifier
for animateTransform.

• svg/SVGAnimatedTransformList.cpp: Removed.
• svg/SVGAnimatedTransformList.h: Removed.
• svg/SVGAnimatedType.h: Removed.
• svg/SVGAnimatedTypeAnimator.cpp: Removed.
• svg/SVGAnimatedTypeAnimator.h: Removed.
• svg/SVGAnimationElement.cpp:

(WebCore::SVGAnimationElement::adjustForInheritance): Deleted.

• svg/SVGAnimationElement.h:

(WebCore::SVGAnimationElement::adjustForInheritance): Deleted.
(WebCore::SVGAnimationElement::adjustFromToListValues): Deleted.
(WebCore::SVGAnimationElement::animateDiscreteType): Deleted.
These functions were used by SVGLegacyAttributeAnimationController.

• svg/SVGAnimatorFactory.h: Removed.
• svg/SVGExternalResourcesRequired.h:

(WebCore::SVGExternalResourcesRequired::isKnownAttribute):

• svg/SVGFEImageElement.h:
• svg/SVGFEMorphologyElement.h:
• svg/SVGFETileElement.h:
• svg/SVGFitToViewBox.h:

(WebCore::SVGFitToViewBox::isKnownAttribute):

• svg/SVGGradientElement.cpp:

(WebCore::SVGGradientElement::SVGGradientElement):
(WebCore::SVGGradientElement::parseAttribute):
(WebCore::SVGGradientElement::registerAttributes): Deleted.

• svg/SVGGradientElement.h:

(WebCore::SVGGradientElement::gradientTransform const):
(WebCore::SVGGradientElement::gradientTransformAnimated):
(WebCore::SVGGradientElement::isKnownAttribute):

• svg/SVGGraphicsElement.cpp:

(WebCore::SVGGraphicsElement::SVGGraphicsElement):
(WebCore::SVGGraphicsElement::animatedLocalTransform const):
(WebCore::SVGGraphicsElement::parseAttribute):
(WebCore::SVGGraphicsElement::svgAttributeChanged):
There is one attribute for this element which is "SVGNames::transformAttr"
So there is no need to check for it twice.

(WebCore::SVGGraphicsElement::registerAttributes): Deleted.

• svg/SVGGraphicsElement.h:

(WebCore::SVGGraphicsElement::transform const):
(WebCore::SVGGraphicsElement::transformAnimated):
(WebCore::SVGGraphicsElement::isKnownAttribute): Deleted.

• svg/SVGLangSpace.cpp:

(WebCore::SVGLangSpace::SVGLangSpace):
(WebCore::SVGLangSpace::xmlspace const):
(WebCore::SVGLangSpace::isKnownAttribute):
(WebCore::SVGLangSpace::svgAttributeChanged):
(WebCore::SVGLangSpace::registerAttributes): Deleted.

• svg/SVGLangSpace.h:

(WebCore::SVGLangSpace::xmllang const):
(WebCore::SVGLangSpace::setXmllang):
(WebCore::SVGLangSpace::setXmlspace):
(WebCore::SVGLangSpace::attributeRegistry): Deleted.
(WebCore::SVGLangSpace::isKnownAttribute): Deleted.

• svg/SVGLegacyAttributeAnimationController.cpp: Removed.
• svg/SVGLegacyAttributeAnimationController.h: Removed.
• svg/SVGLinearGradientElement.cpp:

(WebCore::setGradientAttributes):

• svg/SVGMaskElement.h:
• svg/SVGMatrix.h:

(WebCore::SVGMatrix::create):
(WebCore::SVGMatrix::a const):
(WebCore::SVGMatrix::setA):
(WebCore::SVGMatrix::b const):
(WebCore::SVGMatrix::setB):
(WebCore::SVGMatrix::c const):
(WebCore::SVGMatrix::setC):
(WebCore::SVGMatrix::d const):
(WebCore::SVGMatrix::setD):
(WebCore::SVGMatrix::e const):
(WebCore::SVGMatrix::setE):
(WebCore::SVGMatrix::f const):
(WebCore::SVGMatrix::setF):
(WebCore::SVGMatrix::multiply const):
(WebCore::SVGMatrix::inverse const):
(WebCore::SVGMatrix::translate const):
(WebCore::SVGMatrix::scale const):
(WebCore::SVGMatrix::scaleNonUniform const):
(WebCore::SVGMatrix::rotate const):
(WebCore::SVGMatrix::rotateFromVector const):
(WebCore::SVGMatrix::flipX const):
(WebCore::SVGMatrix::flipY const):
(WebCore::SVGMatrix::skewX const):
(WebCore::SVGMatrix::skewY const):

• svg/SVGPatternElement.cpp:

(WebCore::SVGPatternElement::SVGPatternElement):
(WebCore::SVGPatternElement::parseAttribute):
(WebCore::SVGPatternElement::svgAttributeChanged):
(WebCore::SVGPatternElement::collectPatternAttributes const):
(WebCore::SVGPatternElement::localCoordinateSpaceTransform const):
(WebCore::SVGPatternElement::registerAttributes): Deleted.

• svg/SVGPatternElement.h:
• svg/SVGPoint.h:

(WebCore::SVGPoint::matrixTransform const):

• svg/SVGPolyElement.h:

(WebCore::SVGPolyElement::isKnownAttribute): Deleted.

• svg/SVGRadialGradientElement.cpp:

(WebCore::setGradientAttributes):

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::createSVGTransform):
(WebCore::SVGSVGElement::createSVGTransformFromMatrix):
(WebCore::SVGSVGElement::viewBoxToViewTransform const):

• svg/SVGTextElement.cpp:

(WebCore::SVGTextElement::animatedLocalTransform const):

• svg/SVGTransform.cpp: Removed.
• svg/SVGTransform.h:

(WebCore::SVGTransform::create):
(WebCore::SVGTransform::~SVGTransform):
(WebCore::SVGTransform::clone const):
(WebCore::SVGTransform::type):
(WebCore::SVGTransform::angle):
(WebCore::SVGTransform::matrix):
(WebCore::SVGTransform::setMatrix):
(WebCore::SVGTransform::setTranslate):
(WebCore::SVGTransform::setScale):
(WebCore::SVGTransform::setRotate):
(WebCore::SVGTransform::setSkewX):
(WebCore::SVGTransform::setSkewY):
(WebCore::SVGTransform::SVGTransform):

• svg/SVGTransform.idl:
• svg/SVGTransformList.h:
• svg/SVGTransformList.idl:
• svg/SVGTransformListValues.cpp: Removed.
• svg/SVGTransformListValues.h: Removed.
• svg/SVGTransformValue.cpp: Removed.
• svg/SVGTransformValue.h:

(WebCore::SVGTransformValue::SVGTransformValue):
(WebCore::SVGTransformValue::operator=):
(WebCore::SVGTransformValue::matrix const):
(WebCore::SVGTransformValue::rotationCenter const):
(WebCore::SVGTransformValue::isValid const):
(WebCore::SVGTransformValue::setMatrix):
(WebCore::SVGTransformValue::matrixDidChange):
(WebCore::SVGTransformValue::translate const):
(WebCore::SVGTransformValue::setTranslate):
(WebCore::SVGTransformValue::scale const):
(WebCore::SVGTransformValue::setScale):
(WebCore::SVGTransformValue::setRotate):
(WebCore::SVGTransformValue::setSkewX):
(WebCore::SVGTransformValue::setSkewY):
(WebCore::SVGTransformValue::valueAsString const):
(WebCore::SVGTransformValue::prefixForTransfromType):
(WebCore::SVGTransformValue::appendNumbers const):
(WebCore::SVGTransformValue::appendMatrix const):
(WebCore::SVGTransformValue::appendTranslate const):
(WebCore::SVGTransformValue::appendScale const):
(WebCore::SVGTransformValue::appendRotate const):
(WebCore::SVGTransformValue::appendSkewX const):
(WebCore::SVGTransformValue::appendSkewY const):
(WebCore::SVGTransformValue::matrix): Deleted.

• svg/SVGTransformable.cpp:

(WebCore::SVGTransformable::parseAndSkipType):
(WebCore::parseAndSkipType): Deleted.
(WebCore::SVGTransformable::parseTransformAttribute): Deleted.
The code of this function was moved to SVGTransformList::parse().

• svg/SVGTransformable.h:

There is no need for enum TransformParsingMode. It was used by
SVGViewSpec::parseViewSpec() to tell SVGTransformable::parseTransformAttribute()
not to clear the list. SVGTransfromList now has two parse() functions:
one public and the second is private. The public one clear the list
before parsing the input String. The private one just does the parsing.
SVGViewSpec::parseViewSpec() calls the private once since it is a friend
of SVGTransfromList.

• svg/SVGValue.h: Removed.
• svg/SVGViewSpec.cpp:

(WebCore::SVGViewSpec::SVGViewSpec):
(WebCore::SVGViewSpec::reset):
(WebCore::SVGViewSpec::parseViewSpec):
(WebCore::SVGViewSpec::registerAttributes): Deleted.
(WebCore::SVGViewSpec::transform): Deleted.

• svg/SVGViewSpec.h:
• svg/properties/SVGAnimatedPropertyAccessorImpl.h:
• svg/properties/SVGAnimatedPropertyAnimatorImpl.h:
• svg/properties/SVGAnimatedPropertyImpl.h:
• svg/properties/SVGAnimatedTransformListPropertyTearOff.h: Removed.
• svg/properties/SVGAnimationAdditiveListFunctionImpl.h:

(WebCore::SVGAnimationTransformListFunction::progress):

• svg/properties/SVGAnimationAdditiveValueFunctionImpl.h:
• svg/properties/SVGAttributeRegistry.h:
• svg/properties/SVGMatrixTearOff.h: Removed.
• svg/properties/SVGPropertyAccessorImpl.h:
• svg/properties/SVGPropertyOwnerRegistry.h:

(WebCore::SVGPropertyOwnerRegistry::registerProperty):

LayoutTests:

• svg/dom/SVGTransformList-basics-expected.txt:
• svg/dom/SVGTransformList-basics.xhtml:

These changes are required because SVGTransfromList will be following the
SVG2 specs regarding adding new items to the list.

See ​https://www.w3.org/TR/SVG/types.html#TermListInterface.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGTransformList-basics-expected.txt (modified) (4 diffs)
• LayoutTests/svg/dom/SVGTransformList-basics.xhtml (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Sources.txt (modified) (3 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (27 diffs)
• Source/WebCore/svg/SVGAnimateElementBase.cpp (modified) (6 diffs)
• Source/WebCore/svg/SVGAnimateElementBase.h (modified) (1 diff)
• Source/WebCore/svg/SVGAnimateTransformElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGAnimateTransformElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGAnimatedTransformList.cpp (deleted)
• Source/WebCore/svg/SVGAnimatedTransformList.h (deleted)
• Source/WebCore/svg/SVGAnimatedType.h (deleted)
• Source/WebCore/svg/SVGAnimatedTypeAnimator.cpp (deleted)
• Source/WebCore/svg/SVGAnimatedTypeAnimator.h (deleted)
• Source/WebCore/svg/SVGAnimationElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGAnimationElement.h (modified) (3 diffs)
• Source/WebCore/svg/SVGAnimatorFactory.h (deleted)
• Source/WebCore/svg/SVGElement.h (modified) (2 diffs)
• Source/WebCore/svg/SVGExternalResourcesRequired.h (modified) (1 diff)
• Source/WebCore/svg/SVGFEImageElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGFEMorphologyElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGFETileElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGFitToViewBox.h (modified) (1 diff)
• Source/WebCore/svg/SVGGradientElement.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGGradientElement.h (modified) (4 diffs)
• Source/WebCore/svg/SVGGraphicsElement.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGGraphicsElement.h (modified) (4 diffs)
• Source/WebCore/svg/SVGLangSpace.cpp (modified) (3 diffs)
• Source/WebCore/svg/SVGLangSpace.h (modified) (5 diffs)
• Source/WebCore/svg/SVGLegacyAttributeAnimationController.cpp (deleted)
• Source/WebCore/svg/SVGLegacyAttributeAnimationController.h (deleted)
• Source/WebCore/svg/SVGLinearGradientElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGMaskElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGMatrix.h (modified) (23 diffs)
• Source/WebCore/svg/SVGPatternElement.cpp (modified) (7 diffs)
• Source/WebCore/svg/SVGPatternElement.h (modified) (5 diffs)
• Source/WebCore/svg/SVGPoint.h (modified) (1 diff)
• Source/WebCore/svg/SVGPolyElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGRadialGradientElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGTextElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGTransform.cpp (deleted)
• Source/WebCore/svg/SVGTransform.h (modified) (8 diffs)
• Source/WebCore/svg/SVGTransform.idl (modified) (1 diff)
• Source/WebCore/svg/SVGTransformList.h (modified) (3 diffs)
• Source/WebCore/svg/SVGTransformList.idl (modified) (1 diff)
• Source/WebCore/svg/SVGTransformListValues.cpp (deleted)
• Source/WebCore/svg/SVGTransformListValues.h (deleted)
• Source/WebCore/svg/SVGTransformValue.cpp (deleted)
• Source/WebCore/svg/SVGTransformValue.h (modified) (2 diffs)
• Source/WebCore/svg/SVGTransformable.cpp (modified) (3 diffs)
• Source/WebCore/svg/SVGTransformable.h (modified) (1 diff)
• Source/WebCore/svg/SVGValue.h (deleted)
• Source/WebCore/svg/SVGViewSpec.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGViewSpec.h (modified) (4 diffs)
• Source/WebCore/svg/properties/SVGAnimatedPropertyAccessorImpl.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGAnimatedPropertyAnimatorImpl.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGAnimatedPropertyImpl.h (modified) (3 diffs)
• Source/WebCore/svg/properties/SVGAnimatedTransformListPropertyTearOff.h (deleted)
• Source/WebCore/svg/properties/SVGAnimationAdditiveListFunctionImpl.h (modified) (2 diffs)
• Source/WebCore/svg/properties/SVGAnimationAdditiveValueFunctionImpl.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGAttributeRegistry.h (modified) (2 diffs)
• Source/WebCore/svg/properties/SVGMatrixTearOff.h (deleted)
• Source/WebCore/svg/properties/SVGPropertyAccessorImpl.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGPropertyOwnerRegistry.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Remove the SVG tear off objects for SVGMatrix, SVGTransfrom, SVGTransformList and SVGAnimatedTransformList
+        https://bugs.webkit.org/show_bug.cgi?id=196086
+
+        Reviewed by Simon Fraser.
+
+        * svg/dom/SVGTransformList-basics-expected.txt:
+        * svg/dom/SVGTransformList-basics.xhtml:
+        These changes are required because SVGTransfromList will be following the
+        SVG2 specs regarding adding new items to the list. 
+
+        See https://www.w3.org/TR/SVG/types.html#TermListInterface.
+
 2019-04-01  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/svg/dom/SVGTransformList-basics-expected.txt

@@ -28 +28 @@
 PASS circle1.transform.baseVal.insertItemBefore(null) threw exception TypeError: Not enough arguments.
 PASS circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 'aString') is circle1.transform.baseVal.getItem(0)
+PASS dumpTransform(circle1.transform.baseVal.removeItem(2)) is "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"
 PASS circle1.transform.baseVal.numberOfItems is 2
 PASS dumpTransform(circle1.transform.baseVal.getItem(0)) is "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"
@@ -33 +34 @@
 PASS circle1.getAttribute('transform') is "translate(10 10) scale(2 2)"
 PASS circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), circle1) is circle1.transform.baseVal.getItem(0)
+PASS dumpTransform(circle1.transform.baseVal.removeItem(2)) is "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"
 PASS circle1.transform.baseVal.numberOfItems is 2
 PASS dumpTransform(circle1.transform.baseVal.getItem(0)) is "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"
@@ -38 +40 @@
 PASS circle1.getAttribute('transform') is "scale(2 2) translate(10 10)"
 PASS circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), null) is circle1.transform.baseVal.getItem(0)
+PASS dumpTransform(circle1.transform.baseVal.removeItem(2)) is "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"
 PASS circle1.transform.baseVal.numberOfItems is 2
 PASS dumpTransform(circle1.transform.baseVal.getItem(0)) is "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"
@@ -43 +46 @@
 PASS circle1.getAttribute('transform') is "translate(10 10) scale(2 2)"
 PASS circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 0) is circle1.transform.baseVal.getItem(0)
+PASS dumpTransform(circle1.transform.baseVal.removeItem(2)) is "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"
 PASS circle1.transform.baseVal.numberOfItems is 2
 PASS dumpTransform(circle1.transform.baseVal.getItem(0)) is "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"

trunk/LayoutTests/svg/dom/SVGTransformList-basics.xhtml

@@ -75 +75 @@
  
     shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 'aString')", "circle1.transform.baseVal.getItem(0)");
+    shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.removeItem(2))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]");
     shouldBe("circle1.transform.baseVal.numberOfItems", "2");
     shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]");
@@ -81 +82 @@
 
     shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), circle1)", "circle1.transform.baseVal.getItem(0)");
+    shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.removeItem(2))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]");
     shouldBe("circle1.transform.baseVal.numberOfItems", "2");
     shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]");
@@ -87 +89 @@
 
     shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), null)", "circle1.transform.baseVal.getItem(0)");
+    shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.removeItem(2))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]");
     shouldBe("circle1.transform.baseVal.numberOfItems", "2");
     shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]");
@@ -93 +96 @@
 
     shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 0)", "circle1.transform.baseVal.getItem(0)");
+    shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.removeItem(2))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]");
     shouldBe("circle1.transform.baseVal.numberOfItems", "2");
     shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Remove the SVG tear off objects for SVGMatrix, SVGTransfrom, SVGTransformList and SVGAnimatedTransformList
+        https://bugs.webkit.org/show_bug.cgi?id=196086
+
+        Reviewed by Simon Fraser.
+
+        The IDL changes:
+
+        SVGTransform.idl:
+            Remove the NewObject qualifier from matrix attribute. This matches 
+            the specs: https://www.w3.org/TR/SVG11/coords.html#InterfaceSVGTransform.
+            SVGTransform will internally hold an SVGMatrix. A change in this
+            SVGMatrix will affect the container SVGTransform.
+
+        SVGTransformList.idl:
+            Remove the NewObject qualifier from consolidate() method. This matches
+            the specs:
+            https://www.w3.org/TR/SVG11/coords.html#__svg__SVGTransformList__consolidate
+            The method consolidate() should return a reference to the first item
+            in the list after consolidating it.
+
+        Code changes:
+
+        -- SVGMatrix is now a superclass of SVGValueProperty<AffineTransform>.
+           No need for SVGMatrixValue since it was wrapper of AffineTransform.
+
+        -- SVGTransformValue now holds a Ref<SVGMatrix> member in addition to the
+           angle and the rotationCenter. Ref<SVGMatrix> is what SVGTransform.matrix
+           will return. So a change in this matrix will change the owner SVGTransform.
+
+        -- SVGTransform is now the owner of SVGMatrix via its SVGTransformValue.
+
+        -- SVGTransformList is now a superclass of SVGValuePropertyList<SVGTransform>.
+           It is responsible for parsing a String to items of SVGTransform.
+
+        -- SVGAnimatedTransformList is now defined as SVGAnimatedPropertyList<
+           SVGTransformList>.
+
+        Note the ownership chain of these objects is the following:
+
+        -- SVGAnimatedTransformList owns the SVGTransformList via its baseVal 
+           and animVal members.
+
+        -- SVGTransformList owns SVGTransform via its list of items
+
+        -- SVGTransform owns SVGMatrix via its SVGTransformValue.
+
+           So a change in SVGMatrix will propagate to the owner SVGElement through
+           the following ownership chain:
+
+           SVGMatrix
+             |_ SVGTransfrom
+                  |_ SVGTransformList
+                       |_ SVGAmimatedTransformList
+                            |_ SVGElement
+
+        To get the mechanics of this change right, a new accessor, a new animator
+        and animation functions are added for the SVGAnimatedTransformList.
+
+        -- SVGViewSpec used to hold an SVGAnimatedTransformListAttribute for the
+        member m_transform although this member should not be animated. See the
+        comment in the old SVGViewSpec::transform(). This has been changed in this
+        patch. SVGViewSpec now holds Ref<SVGTransformList> which matches the specs:
+        https://www.w3.org/TR/SVG11/types.html#InterfaceSVGViewSpec.
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * svg/SVGAnimateElementBase.cpp:
+        (WebCore::SVGAnimateElementBase::attributeAnimationController):
+        (WebCore::SVGAnimateElementBase::hasValidAttributeType const):
+        (WebCore::SVGAnimateElementBase::calculateToAtEndOfDurationValue):
+        (WebCore::SVGAnimateElementBase::calculateFromAndToValues):
+        (WebCore::SVGAnimateElementBase::calculateFromAndByValues):
+        * svg/SVGAnimateElementBase.h:
+        (WebCore::SVGAnimateElementBase::animateRangeString const):
+        * svg/SVGAnimateTransformElement.cpp:
+        (WebCore::SVGAnimateTransformElement::animateRangeString const):
+        * svg/SVGAnimateTransformElement.h:
+                This change is needed because animating the transform attribute can be
+        written as
+            <animate ... from="translate(100)" to="translate(200)"/>
+        or
+            <animateTransform type="translate" from="100" to="200"/>"
+        So we need to surround the animation range string with the type qualifier
+        for animateTransform.
+
+        * svg/SVGAnimatedTransformList.cpp: Removed.
+        * svg/SVGAnimatedTransformList.h: Removed.
+        * svg/SVGAnimatedType.h: Removed.
+        * svg/SVGAnimatedTypeAnimator.cpp: Removed.
+        * svg/SVGAnimatedTypeAnimator.h: Removed.
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::adjustForInheritance): Deleted.
+        * svg/SVGAnimationElement.h:
+        (WebCore::SVGAnimationElement::adjustForInheritance): Deleted.
+        (WebCore::SVGAnimationElement::adjustFromToListValues): Deleted.
+        (WebCore::SVGAnimationElement::animateDiscreteType): Deleted.
+        These functions were used by SVGLegacyAttributeAnimationController.
+
+        * svg/SVGAnimatorFactory.h: Removed.
+        * svg/SVGExternalResourcesRequired.h:
+        (WebCore::SVGExternalResourcesRequired::isKnownAttribute):
+        * svg/SVGFEImageElement.h:
+        * svg/SVGFEMorphologyElement.h:
+        * svg/SVGFETileElement.h:
+        * svg/SVGFitToViewBox.h:
+        (WebCore::SVGFitToViewBox::isKnownAttribute):
+        * svg/SVGGradientElement.cpp:
+        (WebCore::SVGGradientElement::SVGGradientElement):
+        (WebCore::SVGGradientElement::parseAttribute):
+        (WebCore::SVGGradientElement::registerAttributes): Deleted.
+        * svg/SVGGradientElement.h:
+        (WebCore::SVGGradientElement::gradientTransform const):
+        (WebCore::SVGGradientElement::gradientTransformAnimated):
+        (WebCore::SVGGradientElement::isKnownAttribute):
+        * svg/SVGGraphicsElement.cpp:
+        (WebCore::SVGGraphicsElement::SVGGraphicsElement):
+        (WebCore::SVGGraphicsElement::animatedLocalTransform const):
+        (WebCore::SVGGraphicsElement::parseAttribute):
+        (WebCore::SVGGraphicsElement::svgAttributeChanged):
+        There is one attribute for this element which is "SVGNames::transformAttr"
+        So there is no need to check for it twice.
+
+        (WebCore::SVGGraphicsElement::registerAttributes): Deleted.
+        * svg/SVGGraphicsElement.h:
+        (WebCore::SVGGraphicsElement::transform const):
+        (WebCore::SVGGraphicsElement::transformAnimated):
+        (WebCore::SVGGraphicsElement::isKnownAttribute): Deleted.
+        * svg/SVGLangSpace.cpp:
+        (WebCore::SVGLangSpace::SVGLangSpace):
+        (WebCore::SVGLangSpace::xmlspace const):
+        (WebCore::SVGLangSpace::isKnownAttribute):
+        (WebCore::SVGLangSpace::svgAttributeChanged):
+        (WebCore::SVGLangSpace::registerAttributes): Deleted.
+        * svg/SVGLangSpace.h:
+        (WebCore::SVGLangSpace::xmllang const):
+        (WebCore::SVGLangSpace::setXmllang):
+        (WebCore::SVGLangSpace::setXmlspace):
+        (WebCore::SVGLangSpace::attributeRegistry): Deleted.
+        (WebCore::SVGLangSpace::isKnownAttribute): Deleted.
+        * svg/SVGLegacyAttributeAnimationController.cpp: Removed.
+        * svg/SVGLegacyAttributeAnimationController.h: Removed.
+        * svg/SVGLinearGradientElement.cpp:
+        (WebCore::setGradientAttributes):
+        * svg/SVGMaskElement.h:
+        * svg/SVGMatrix.h:
+        (WebCore::SVGMatrix::create):
+        (WebCore::SVGMatrix::a const):
+        (WebCore::SVGMatrix::setA):
+        (WebCore::SVGMatrix::b const):
+        (WebCore::SVGMatrix::setB):
+        (WebCore::SVGMatrix::c const):
+        (WebCore::SVGMatrix::setC):
+        (WebCore::SVGMatrix::d const):
+        (WebCore::SVGMatrix::setD):
+        (WebCore::SVGMatrix::e const):
+        (WebCore::SVGMatrix::setE):
+        (WebCore::SVGMatrix::f const):
+        (WebCore::SVGMatrix::setF):
+        (WebCore::SVGMatrix::multiply const):
+        (WebCore::SVGMatrix::inverse const):
+        (WebCore::SVGMatrix::translate const):
+        (WebCore::SVGMatrix::scale const):
+        (WebCore::SVGMatrix::scaleNonUniform const):
+        (WebCore::SVGMatrix::rotate const):
+        (WebCore::SVGMatrix::rotateFromVector const):
+        (WebCore::SVGMatrix::flipX const):
+        (WebCore::SVGMatrix::flipY const):
+        (WebCore::SVGMatrix::skewX const):
+        (WebCore::SVGMatrix::skewY const):
+        * svg/SVGPatternElement.cpp:
+        (WebCore::SVGPatternElement::SVGPatternElement):
+        (WebCore::SVGPatternElement::parseAttribute):
+        (WebCore::SVGPatternElement::svgAttributeChanged):
+        (WebCore::SVGPatternElement::collectPatternAttributes const):
+        (WebCore::SVGPatternElement::localCoordinateSpaceTransform const):
+        (WebCore::SVGPatternElement::registerAttributes): Deleted.
+        * svg/SVGPatternElement.h:
+        * svg/SVGPoint.h:
+        (WebCore::SVGPoint::matrixTransform const):
+        * svg/SVGPolyElement.h:
+        (WebCore::SVGPolyElement::isKnownAttribute): Deleted.
+        * svg/SVGRadialGradientElement.cpp:
+        (WebCore::setGradientAttributes):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::createSVGTransform):
+        (WebCore::SVGSVGElement::createSVGTransformFromMatrix):
+        (WebCore::SVGSVGElement::viewBoxToViewTransform const):
+        * svg/SVGTextElement.cpp:
+        (WebCore::SVGTextElement::animatedLocalTransform const):
+        * svg/SVGTransform.cpp: Removed.
+        * svg/SVGTransform.h:
+        (WebCore::SVGTransform::create):
+        (WebCore::SVGTransform::~SVGTransform):
+        (WebCore::SVGTransform::clone const):
+        (WebCore::SVGTransform::type):
+        (WebCore::SVGTransform::angle):
+        (WebCore::SVGTransform::matrix):
+        (WebCore::SVGTransform::setMatrix):
+        (WebCore::SVGTransform::setTranslate):
+        (WebCore::SVGTransform::setScale):
+        (WebCore::SVGTransform::setRotate):
+        (WebCore::SVGTransform::setSkewX):
+        (WebCore::SVGTransform::setSkewY):
+        (WebCore::SVGTransform::SVGTransform):
+        * svg/SVGTransform.idl:
+        * svg/SVGTransformList.h:
+        * svg/SVGTransformList.idl:
+        * svg/SVGTransformListValues.cpp: Removed.
+        * svg/SVGTransformListValues.h: Removed.
+        * svg/SVGTransformValue.cpp: Removed.
+        * svg/SVGTransformValue.h:
+        (WebCore::SVGTransformValue::SVGTransformValue):
+        (WebCore::SVGTransformValue::operator=):
+        (WebCore::SVGTransformValue::matrix const):
+        (WebCore::SVGTransformValue::rotationCenter const):
+        (WebCore::SVGTransformValue::isValid const):
+        (WebCore::SVGTransformValue::setMatrix):
+        (WebCore::SVGTransformValue::matrixDidChange):
+        (WebCore::SVGTransformValue::translate const):
+        (WebCore::SVGTransformValue::setTranslate):
+        (WebCore::SVGTransformValue::scale const):
+        (WebCore::SVGTransformValue::setScale):
+        (WebCore::SVGTransformValue::setRotate):
+        (WebCore::SVGTransformValue::setSkewX):
+        (WebCore::SVGTransformValue::setSkewY):
+        (WebCore::SVGTransformValue::valueAsString const):
+        (WebCore::SVGTransformValue::prefixForTransfromType):
+        (WebCore::SVGTransformValue::appendNumbers const):
+        (WebCore::SVGTransformValue::appendMatrix const):
+        (WebCore::SVGTransformValue::appendTranslate const):
+        (WebCore::SVGTransformValue::appendScale const):
+        (WebCore::SVGTransformValue::appendRotate const):
+        (WebCore::SVGTransformValue::appendSkewX const):
+        (WebCore::SVGTransformValue::appendSkewY const):
+        (WebCore::SVGTransformValue::matrix): Deleted.
+        * svg/SVGTransformable.cpp:
+        (WebCore::SVGTransformable::parseAndSkipType):
+        (WebCore::parseAndSkipType): Deleted.
+        (WebCore::SVGTransformable::parseTransformAttribute): Deleted.
+        The code of this function was moved to SVGTransformList::parse().
+
+        * svg/SVGTransformable.h:
+        There is no need for enum TransformParsingMode. It was used by 
+        SVGViewSpec::parseViewSpec() to tell SVGTransformable::parseTransformAttribute()
+        not to clear the list. SVGTransfromList now has two parse() functions:
+        one public and the second is private. The public one clear the list
+        before parsing the input String. The private one just does the parsing.
+        SVGViewSpec::parseViewSpec() calls the private once since it is a friend
+        of SVGTransfromList.
+
+        * svg/SVGValue.h: Removed.
+        * svg/SVGViewSpec.cpp:
+        (WebCore::SVGViewSpec::SVGViewSpec):
+        (WebCore::SVGViewSpec::reset):
+        (WebCore::SVGViewSpec::parseViewSpec):
+        (WebCore::SVGViewSpec::registerAttributes): Deleted.
+        (WebCore::SVGViewSpec::transform): Deleted.
+        * svg/SVGViewSpec.h:
+        * svg/properties/SVGAnimatedPropertyAccessorImpl.h:
+        * svg/properties/SVGAnimatedPropertyAnimatorImpl.h:
+        * svg/properties/SVGAnimatedPropertyImpl.h:
+        * svg/properties/SVGAnimatedTransformListPropertyTearOff.h: Removed.
+        * svg/properties/SVGAnimationAdditiveListFunctionImpl.h:
+        (WebCore::SVGAnimationTransformListFunction::progress):
+        * svg/properties/SVGAnimationAdditiveValueFunctionImpl.h:
+        * svg/properties/SVGAttributeRegistry.h:
+        * svg/properties/SVGMatrixTearOff.h: Removed.
+        * svg/properties/SVGPropertyAccessorImpl.h:
+        * svg/properties/SVGPropertyOwnerRegistry.h:
+        (WebCore::SVGPropertyOwnerRegistry::registerProperty):
+
 2019-04-01  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/Sources.txt

@@ -2230 +2230 @@
 svg/SVGAnimateMotionElement.cpp
 svg/SVGAnimateTransformElement.cpp
-svg/SVGAnimatedTransformList.cpp
-svg/SVGAnimatedTypeAnimator.cpp
 svg/SVGAnimationElement.cpp
 svg/SVGAttributeAnimationController.cpp
@@ -2292 +2290 @@
 svg/SVGImageLoader.cpp
 svg/SVGLangSpace.cpp
-svg/SVGLegacyAttributeAnimationController.cpp
 svg/SVGLengthContext.cpp
 svg/SVGLengthValue.cpp
@@ -2339 +2336 @@
 svg/SVGTitleElement.cpp
 svg/SVGToOTFFontConversion.cpp
-svg/SVGTransform.cpp
 svg/SVGTransformDistance.cpp
-svg/SVGTransformListValues.cpp
-svg/SVGTransformValue.cpp
 svg/SVGTransformable.cpp
 svg/SVGURIReference.cpp

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

@@ -242 +242 @@
                 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 081AA8D91111237E002AB06E /* SVGElementRareData.h */; };
                 081EBF3B0FD34F4100DA7559 /* SVGFilterBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */; };
-                08250939128BD4D800E2ED8E /* SVGAnimatedTransformList.h in Headers */ = {isa = PBXBuildFile; fileRef = 08250938128BD4D800E2ED8E /* SVGAnimatedTransformList.h */; };
                 083DAEA70F01A7FB00342754 /* RenderTextControlMultiLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 083DAEA30F01A7FB00342754 /* RenderTextControlMultiLine.h */; };
                 083DAEA90F01A7FB00342754 /* RenderTextControlSingleLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 083DAEA50F01A7FB00342754 /* RenderTextControlSingleLine.h */; };
@@ -255 +254 @@
                 0854B0231255E4E600B9CDD0 /* SVGRootInlineBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0111255E4E600B9CDD0 /* SVGRootInlineBox.h */; };
                 0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */; };
-                085A15931289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */; };
                 085B92BB0EFDE73D00E6123C /* FormDataBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 085B92B90EFDE73D00E6123C /* FormDataBuilder.h */; settings = {ATTRIBUTES = (); }; };
                 08641D4812142F7D008DE9F6 /* RenderImageResourceStyleImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 08641D4612142F7D008DE9F6 /* RenderImageResourceStyleImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -274 +272 @@
                 08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
                 08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C925180FCC7C4A00480DEC /* FilterEffect.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                08CA3D4412894A3800FFF260 /* SVGMatrixTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 08CA3D4312894A3800FFF260 /* SVGMatrixTearOff.h */; };
                 08EDE19F12A50B8E00B95797 /* SVGRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 08EDE19E12A50B8E00B95797 /* SVGRect.h */; };
                 08F0BFC31255C53C00075185 /* SVGTextChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 08F0BFBE1255C53C00075185 /* SVGTextChunk.h */; };
@@ -1186 +1183 @@
                 439046EC12DA25E800AF80A9 /* RenderMathMLToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 439046D812DA25E800AF80A9 /* RenderMathMLToken.h */; };
                 439176E012DA25E17BAF80A2 /* MathMLStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 439176CC12DA25E17BAF80A2 /* MathMLStyle.h */; };
-                439D334313A6911C00C20F4F /* SVGAnimatedType.h in Headers */ = {isa = PBXBuildFile; fileRef = 439D334013A6911C00C20F4F /* SVGAnimatedType.h */; };
-                439D334413A6911C00C20F4F /* SVGAnimatedTypeAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 439D334113A6911C00C20F4F /* SVGAnimatedTypeAnimator.h */; };
-                439D334513A6911C00C20F4F /* SVGAnimatorFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 439D334213A6911C00C20F4F /* SVGAnimatorFactory.h */; };
                 43B85ED418CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */; };
                 43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
@@ -5548 +5542 @@
                 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilterBuilder.cpp; sourceTree = "<group>"; };
                 081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFilterBuilder.h; sourceTree = "<group>"; };
-                08250938128BD4D800E2ED8E /* SVGAnimatedTransformList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedTransformList.h; sourceTree = "<group>"; };
                 083DAEA20F01A7FB00342754 /* RenderTextControlMultiLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControlMultiLine.cpp; sourceTree = "<group>"; };
                 083DAEA30F01A7FB00342754 /* RenderTextControlMultiLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTextControlMultiLine.h; sourceTree = "<group>"; };
@@ -5571 +5564 @@
                 0854B0121255E4E600B9CDD0 /* SVGTextQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextQuery.cpp; sourceTree = "<group>"; };
                 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextQuery.h; sourceTree = "<group>"; };
-                085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedTransformListPropertyTearOff.h; sourceTree = "<group>"; };
                 085B92B80EFDE73D00E6123C /* FormDataBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataBuilder.cpp; sourceTree = "<group>"; };
                 085B92B90EFDE73D00E6123C /* FormDataBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataBuilder.h; sourceTree = "<group>"; };
@@ -5596 +5588 @@
                 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterEffect.cpp; sourceTree = "<group>"; };
                 08C925180FCC7C4A00480DEC /* FilterEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterEffect.h; sourceTree = "<group>"; };
-                08CA3D4312894A3800FFF260 /* SVGMatrixTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMatrixTearOff.h; sourceTree = "<group>"; };
                 08EDE19E12A50B8E00B95797 /* SVGRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGRect.h; sourceTree = "<group>"; };
                 08F0BFBD1255C53C00075185 /* SVGTextChunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextChunk.cpp; sourceTree = "<group>"; };
@@ -7526 +7517 @@
                 439176CB12DA25E17BAF80A2 /* MathMLStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLStyle.cpp; sourceTree = "<group>"; };
                 439176CC12DA25E17BAF80A2 /* MathMLStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLStyle.h; sourceTree = "<group>"; };
-                439D334013A6911C00C20F4F /* SVGAnimatedType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedType.h; sourceTree = "<group>"; };
-                439D334113A6911C00C20F4F /* SVGAnimatedTypeAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedTypeAnimator.h; sourceTree = "<group>"; };
-                439D334213A6911C00C20F4F /* SVGAnimatorFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatorFactory.h; sourceTree = "<group>"; };
                 43B85ED018CBEACE00E31AF4 /* makeSelectorPseudoClassAndCompatibilityElementMap.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = makeSelectorPseudoClassAndCompatibilityElementMap.py; sourceTree = "<group>"; };
                 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SelectorPseudoClassAndCompatibilityElementMap.cpp; path = DerivedSources/WebCore/SelectorPseudoClassAndCompatibilityElementMap.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -8501 +8489 @@
                 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 55137B2C20379E550001004B /* SVGMarkerTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMarkerTypes.h; sourceTree = "<group>"; };
-                55137B34203CEB710001004B /* SVGValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGValue.h; sourceTree = "<group>"; };
                 55346AF021150FAF0059BCDD /* SVGAttributeOwnerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttributeOwnerProxy.h; sourceTree = "<group>"; };
                 55346AFA2117FFAF0059BCDD /* SVGAttributeOwnerProxyImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttributeOwnerProxyImpl.h; sourceTree = "<group>"; };
@@ -9284 +9271 @@
                 7156BC9F21CA350600534397 /* BasicEffectTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BasicEffectTiming.h; sourceTree = "<group>"; };
                 7157E3D11DC1EE4B0094550E /* scrubbing-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "scrubbing-support.js"; sourceTree = "<group>"; };
-                7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTransformList.cpp; sourceTree = "<group>"; };
                 715AD71D2050512400D592DC /* DeclarativeAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeclarativeAnimation.h; sourceTree = "<group>"; };
                 715AD71F2050512400D592DC /* DeclarativeAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeclarativeAnimation.cpp; sourceTree = "<group>"; };
@@ -9386 +9372 @@
                 723F97BC2238EE08007F079C /* SVGAttributeAnimationController.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAttributeAnimationController.cpp; sourceTree = "<group>"; };
                 723F97BD2238EE08007F079C /* SVGAttributeAnimationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttributeAnimationController.h; sourceTree = "<group>"; };
-                723F97BE2239512D007F079C /* SVGLegacyAttributeAnimationController.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLegacyAttributeAnimationController.cpp; sourceTree = "<group>"; };
-                723F97BF2239512D007F079C /* SVGLegacyAttributeAnimationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGLegacyAttributeAnimationController.h; sourceTree = "<group>"; };
                 723F97C022396B88007F079C /* SVGAttributeAnimationControllerBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttributeAnimationControllerBase.h; sourceTree = "<group>"; };
                 723F97C122397725007F079C /* SVGAttributeAnimationControllerBase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAttributeAnimationControllerBase.cpp; sourceTree = "<group>"; };
@@ -9622 +9606 @@
                 7C330A061DF9F95100D3395C /* JSPositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionOptions.h; sourceTree = "<group>"; };
                 7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentFragmentCustom.cpp; sourceTree = "<group>"; };
-                7C39C36C1DDB8BB000FEFB29 /* SVGTransformListValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTransformListValues.cpp; sourceTree = "<group>"; };
-                7C39C36D1DDB8BB000FEFB29 /* SVGTransformListValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTransformListValues.h; sourceTree = "<group>"; };
                 7C3A91E51C963B8800D1A7E3 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };
                 7C3B796F1908757B00B47A2D /* UserMessageHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMessageHandler.cpp; sourceTree = "<group>"; };
@@ -9872 +9854 @@
                 7CE58D521DD7B09300128552 /* SVGLengthValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLengthValue.cpp; sourceTree = "<group>"; };
                 7CE58D531DD7B09300128552 /* SVGLengthValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLengthValue.h; sourceTree = "<group>"; };
-                7CE58D551DD7D96D00128552 /* SVGTransformValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTransformValue.cpp; sourceTree = "<group>"; };
                 7CE58D561DD7D96D00128552 /* SVGTransformValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTransformValue.h; sourceTree = "<group>"; };
-                7CE58D591DD7DE5200128552 /* SVGTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTransform.cpp; sourceTree = "<group>"; };
                 7CE68342192143A800F4D928 /* UserMessageHandlerDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMessageHandlerDescriptor.cpp; sourceTree = "<group>"; };
                 7CE68343192143A800F4D928 /* UserMessageHandlerDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageHandlerDescriptor.h; sourceTree = "<group>"; };
@@ -10045 +10025 @@
                 836D032E1DA8A13200FFD96B /* JSClipboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClipboardEvent.h; sourceTree = "<group>"; };
                 836DAA051CEAB7CD00A2B707 /* RenderDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderDescendantIterator.h; sourceTree = "<group>"; };
-                836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; };
                 837056881F50915000D93425 /* JSFileCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileCallback.cpp; sourceTree = "<group>"; };
                 837056891F50915000D93425 /* JSFileSystemEntryCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileSystemEntryCallback.h; sourceTree = "<group>"; };
@@ -13867 +13846 @@
                 D00D77FE2242ED450043F12C /* WebGPUComputePassEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUComputePassEncoder.cpp; sourceTree = "<group>"; };
                 D00D77FF2242ED450043F12C /* WebGPUComputePassEncoder.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUComputePassEncoder.idl; sourceTree = "<group>"; };
-                D00F5940216ECC7A000D71DB /* DOMWindowWebGPU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMWindowWebGPU.h; sourceTree = "<group>"; };
+                D00F5940216ECC7A000D71DB /* DOMWindowWebGPU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMWindowWebGPU.h; sourceTree = "<group>"; };
                 D00F5941216ECC7A000D71DB /* DOMWindowWebGPU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowWebGPU.cpp; sourceTree = "<group>"; };
                 D00F5942216ECC7A000D71DB /* DOMWindowWebGPU.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMWindowWebGPU.idl; sourceTree = "<group>"; };
@@ -16024 +16003 @@
                                 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */,
                                 55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */,
-                                085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */,
                                 721443452240C8BA00F12FF7 /* SVGAnimatedValueProperty.h */,
                                 55BE025F223B29C50032F08A /* SVGAnimationAdditiveFunction.h */,
@@ -16052 +16030 @@
                                 0810764312828556007C63BA /* SVGListProperty.h */,
                                 088A0E00126EF1DB00978F7A /* SVGListPropertyTearOff.h */,
-                                08CA3D4312894A3800FFF260 /* SVGMatrixTearOff.h */,
                                 55EE5354223B29E900FBA944 /* SVGMemberAccessor.h */,
                                 55BE025A223B29C20032F08A /* SVGPointerMemberAccessor.h */,
@@ -23808 +23785 @@
                                 B22277F50D00BF1F0071B782 /* SVGAnimatedRect.idl */,
                                 B22277F60D00BF1F0071B782 /* SVGAnimatedString.idl */,
-                                7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */,
-                                08250938128BD4D800E2ED8E /* SVGAnimatedTransformList.h */,
                                 B22277F80D00BF1F0071B782 /* SVGAnimatedTransformList.idl */,
-                                439D334013A6911C00C20F4F /* SVGAnimatedType.h */,
-                                836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */,
-                                439D334113A6911C00C20F4F /* SVGAnimatedTypeAnimator.h */,
                                 B22277F90D00BF1F0071B782 /* SVGAnimateElement.cpp */,
                                 B22277FA0D00BF1F0071B782 /* SVGAnimateElement.h */,
@@ -23828 +23800 @@
                                 B22278020D00BF1F0071B782 /* SVGAnimationElement.h */,
                                 B22278030D00BF1F0071B782 /* SVGAnimationElement.idl */,
-                                439D334213A6911C00C20F4F /* SVGAnimatorFactory.h */,
                                 723F97BC2238EE08007F079C /* SVGAttributeAnimationController.cpp */,
                                 723F97BD2238EE08007F079C /* SVGAttributeAnimationController.h */,
@@ -24002 +23973 @@
                                 B22278990D00BF200071B782 /* SVGLangSpace.cpp */,
                                 B222789A0D00BF200071B782 /* SVGLangSpace.h */,
-                                723F97BE2239512D007F079C /* SVGLegacyAttributeAnimationController.cpp */,
-                                723F97BF2239512D007F079C /* SVGLegacyAttributeAnimationController.h */,
                                 7CE58D511DD7B09300128552 /* SVGLength.h */,
                                 B222789E0D00BF200071B782 /* SVGLength.idl */,
@@ -24170 +24139 @@
                                 1CCDF5BB1990332400BCEBAD /* SVGToOTFFontConversion.cpp */,
                                 1CCDF5BC1990332400BCEBAD /* SVGToOTFFontConversion.h */,
-                                7CE58D591DD7DE5200128552 /* SVGTransform.cpp */,
                                 B22279410D00BF210071B782 /* SVGTransform.h */,
                                 B22279420D00BF210071B782 /* SVGTransform.idl */,
@@ -24179 +24147 @@
                                 B22279490D00BF210071B782 /* SVGTransformList.h */,
                                 B222794A0D00BF210071B782 /* SVGTransformList.idl */,
-                                7C39C36C1DDB8BB000FEFB29 /* SVGTransformListValues.cpp */,
-                                7C39C36D1DDB8BB000FEFB29 /* SVGTransformListValues.h */,
-                                7CE58D551DD7D96D00128552 /* SVGTransformValue.cpp */,
                                 7CE58D561DD7D96D00128552 /* SVGTransformValue.h */,
                                 B222794B0D00BF210071B782 /* SVGTRefElement.cpp */,
@@ -24199 +24164 @@
                                 B22279570D00BF210071B782 /* SVGUseElement.h */,
                                 B22279580D00BF210071B782 /* SVGUseElement.idl */,
-                                55137B34203CEB710001004B /* SVGValue.h */,
                                 B22279590D00BF210071B782 /* SVGViewElement.cpp */,
                                 B222795A0D00BF210071B782 /* SVGViewElement.h */,
@@ -25886 +25850 @@
                                 D05A99E421C9BF2C00032B75 /* WebGPUPipelineLayout.h */,
                                 D05A99E621C9BF2C00032B75 /* WebGPUPipelineLayout.idl */,
-                                D00487D222457BEA00EED7D9 /* WebGPUPipelineLayoutDescriptor.cpp */,
                                 D00487D222457BEA00EED7D9 /* WebGPUPipelineLayoutDescriptor.cpp */,
                                 D05A99E121C9B50F00032B75 /* WebGPUPipelineLayoutDescriptor.h */,
@@ -31541 +31504 @@
                                 088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */,
                                 55FA7FFF21110E6E005AEFE7 /* SVGAnimatedPropertyType.h in Headers */,
-                                08250939128BD4D800E2ED8E /* SVGAnimatedTransformList.h in Headers */,
-                                085A15931289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h in Headers */,
-                                439D334313A6911C00C20F4F /* SVGAnimatedType.h in Headers */,
-                                439D334413A6911C00C20F4F /* SVGAnimatedTypeAnimator.h in Headers */,
                                 B22279900D00BF220071B782 /* SVGAnimateElement.h in Headers */,
                                 832B843419D8E55100B26055 /* SVGAnimateElementBase.h in Headers */,
@@ -31550 +31509 @@
                                 B22279950D00BF220071B782 /* SVGAnimateTransformElement.h in Headers */,
                                 B22279980D00BF220071B782 /* SVGAnimationElement.h in Headers */,
-                                439D334513A6911C00C20F4F /* SVGAnimatorFactory.h in Headers */,
                                 55FA7FF0210FA386005AEFE7 /* SVGAttribute.h in Headers */,
                                 55FA7FF5210FB6B1005AEFE7 /* SVGAttributeAccessor.h in Headers */,
@@ -31637 +31595 @@
                                 B2227A470D00BF220071B782 /* SVGMaskElement.h in Headers */,
                                 0806E57A12893045007CED32 /* SVGMatrix.h in Headers */,
-                                08CA3D4412894A3800FFF260 /* SVGMatrixTearOff.h in Headers */,
                                 B2227A4B0D00BF220071B782 /* SVGMetadataElement.h in Headers */,
                                 B2A1F2B10CEF0ABF00442F6A /* SVGMissingGlyphElement.h in Headers */,

trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp

@@ -26 +26 @@
 
 #include "QualifiedName.h"
-#include "SVGAnimatorFactory.h"
 #include "SVGAttributeAnimationController.h"
 #include "SVGElement.h"
-#include "SVGLegacyAttributeAnimationController.h"
 #include "SVGNames.h"
 #include <wtf/IsoMallocInlines.h>
@@ -50 +48 @@
     ASSERT(!hasInvalidCSSAttributeType());
 
-    if (!m_attributeAnimationController) {
-        if (targetElement()->isAnimatedAttribute(attributeName()))
-            m_attributeAnimationController = std::make_unique<SVGAttributeAnimationController>(*this, *targetElement());
-        else
-            m_attributeAnimationController = std::make_unique<SVGLegacyAttributeAnimationController>(*this, *targetElement());
-    }
+    if (!m_attributeAnimationController)
+        m_attributeAnimationController = std::make_unique<SVGAttributeAnimationController>(*this, *targetElement());
 
     return *m_attributeAnimationController;
@@ -64 +58 @@
     if (!targetElement() || hasInvalidCSSAttributeType())
         return false;
-
-    if (SVGAnimatorFactory::isSupportedAttributeType(determineAnimatedPropertyType(*targetElement())))
-        return true;
 
     return targetElement()->isAnimatedAttribute(attributeName());
@@ -92 +83 @@
     if (!targetElement())
         return false;
-    return attributeAnimationController().calculateToAtEndOfDurationValue(toAtEndOfDurationString);
+    return attributeAnimationController().calculateToAtEndOfDurationValue(animateRangeString(toAtEndOfDurationString));
 }
 
@@ -99 +90 @@
     if (!targetElement())
         return false;
-    return attributeAnimationController().calculateFromAndToValues(fromString, toString);
+    return attributeAnimationController().calculateFromAndToValues(animateRangeString(fromString), animateRangeString(toString));
 }
 
@@ -106 +97 @@
     if (!this->targetElement())
         return false;
-    return attributeAnimationController().calculateFromAndByValues(fromString, byString);
+    return attributeAnimationController().calculateFromAndByValues(animateRangeString(fromString), animateRangeString(byString));
 }
 

trunk/Source/WebCore/svg/SVGAnimateElementBase.h

@@ -62 +62 @@
     void resetAnimation() override;
 
+    virtual String animateRangeString(const String& string) const { return string; }
+
 private:
     bool hasInvalidCSSAttributeType() const;

trunk/Source/WebCore/svg/SVGAnimateTransformElement.cpp

@@ -67 +67 @@
 }
 
+String SVGAnimateTransformElement::animateRangeString(const String& string) const
+{
+    return SVGTransformValue::prefixForTransfromType(m_type) + string + ')';
 }
+
+}

trunk/Source/WebCore/svg/SVGAnimateTransformElement.h

@@ -42 +42 @@
     bool hasValidAttributeType() const final;
     void parseAttribute(const QualifiedName&, const AtomicString&) final;
+    String animateRangeString(const String&) const final;
 
     SVGTransformValue::SVGTransformType m_type;

trunk/Source/WebCore/svg/SVGAnimationElement.cpp

@@ -628 +628 @@
 }
 
-void SVGAnimationElement::adjustForInheritance(SVGElement* targetElement, const QualifiedName& attributeName, String& value)
-{
-    // FIXME: At the moment the computed style gets returned as a String and needs to get parsed again.
-    // In the future we might want to work with the value type directly to avoid the String parsing.
-    ASSERT(targetElement);
-
-    auto parent = makeRefPtr(targetElement->parentElement());
-    if (!parent || !parent->isSVGElement())
-        return;
-
-    SVGElement& svgParent = downcast<SVGElement>(*parent);
-    computeCSSPropertyValue(&svgParent, cssPropertyID(attributeName.localName()), value);
-}
-
 static bool inheritsFromProperty(SVGElement* targetElement, const QualifiedName& attributeName, const String& value)
 {

trunk/Source/WebCore/svg/SVGAnimationElement.h

@@ -33 +33 @@
 
 class ConditionEventListener;
-class SVGAnimatedType;
 class TimeContainer;
 
@@ -70 +69 @@
     AnimatedPropertyValueType fromPropertyValueType() const { return m_fromPropertyValueType; }
     AnimatedPropertyValueType toPropertyValueType() const { return m_toPropertyValueType; }
-
-    template<typename AnimatedType> void adjustForInheritance(AnimatedType (*parseTypeFromString)(SVGAnimationElement*, const String&), AnimatedPropertyValueType valueType, AnimatedType& animatedType, SVGElement* contextElement)
-    {
-        if (valueType != InheritValue)
-            return;
-        // Replace 'inherit' by its computed property value.
-        ASSERT(parseTypeFromString);
-        String typeString;
-        adjustForInheritance(contextElement, attributeName(), typeString);
-        animatedType = (*parseTypeFromString)(this, typeString);
-    }
-
-    template<typename AnimatedType> bool adjustFromToListValues(const AnimatedType& fromList, const AnimatedType& toList, AnimatedType& animatedList, float percentage, bool resizeAnimatedListIfNeeded = true)
-    {
-        // If no 'to' value is given, nothing to animate.
-        unsigned toListSize = toList.size();
-        if (!toListSize)
-            return false;
-
-        // If the 'from' value is given and it's length doesn't match the 'to' value list length, fallback to a discrete animation.
-        unsigned fromListSize = fromList.size();
-        if (fromListSize != toListSize && fromListSize) {
-            if (percentage < 0.5) {
-                if (animationMode() != AnimationMode::To)
-                    animatedList = AnimatedType(fromList);
-            } else
-                animatedList = AnimatedType(toList);
-
-            return false;
-        }
-
-        ASSERT(!fromListSize || fromListSize == toListSize);
-        if (resizeAnimatedListIfNeeded && animatedList.size() < toListSize)
-            animatedList.resize(toListSize);
-
-        return true;
-    }
-
-    template<typename AnimatedType> void animateDiscreteType(float percentage, const AnimatedType& fromType, const AnimatedType& toType, AnimatedType& animatedType)
-    {
-        if ((animationMode() == AnimationMode::FromTo && percentage > 0.5) || animationMode() == AnimationMode::To || percentage == 1) {
-            animatedType = AnimatedType(toType);
-            return;
-        }
-        animatedType = AnimatedType(fromType);
-    }
 
     void animateAdditiveNumber(float percentage, unsigned repeatCount, float fromNumber, float toNumber, float toAtEndOfDurationNumber, float& animatedNumber)
@@ -193 +146 @@
     unsigned calculateKeyTimesIndex(float percent) const;
 
-    void applyAnimatedValue(ShouldApplyAnimation, SVGElement* targetElement, const QualifiedName& attributeName, SVGAnimatedType*);
-    void adjustForInheritance(SVGElement* targetElement, const QualifiedName& attributeName, String&);
-
     void setCalcMode(const AtomicString&);
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -25 +25 @@
 #include "SVGAnimatedPropertyImpl.h"
 #include "SVGAttributeOwnerProxy.h"
+#include "SVGAttributeOwnerProxyImpl.h"
 #include "SVGLangSpace.h"
 #include "SVGLocatable.h"
@@ -136 +137 @@
 
     // The definition of the owner proxy has to match the class inheritance but we are interested in the SVG objects only.
-    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGElement, SVGLangSpace>;
+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGElement>;
 
     // A super class will override this function to return its owner proxy. The attributes of the super class will
     // be accessible through the registry of the owner proxy.
     virtual const SVGAttributeOwnerProxy& attributeOwnerProxy() const { return m_attributeOwnerProxy; }
+    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
 
     // Helper functions which return info for the super class' attributes.

trunk/Source/WebCore/svg/SVGExternalResourcesRequired.h

@@ -57 +57 @@
     SVGExternalResourcesRequired(SVGElement* contextElement);
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
+    static bool isKnownAttribute(const QualifiedName& attributeName) { return PropertyRegistry::isKnownAttribute(attributeName); }
 
     virtual void setHaveFiredLoadEvent(bool) { }

trunk/Source/WebCore/svg/SVGFEImageElement.h

@@ -52 +52 @@
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
-
     void parseAttribute(const QualifiedName&, const AtomicString&) override;
     void svgAttributeChanged(const QualifiedName&) override;

trunk/Source/WebCore/svg/SVGFEMorphologyElement.h

@@ -76 +76 @@
 
     using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGFEMorphologyElement, SVGFilterPrimitiveStandardAttributes>;
-    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
-    static void registerAttributes();
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
 
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEMorphologyElement, SVGFilterPrimitiveStandardAttributes>;
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
-
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
 
     void parseAttribute(const QualifiedName&, const AtomicString&) override;

trunk/Source/WebCore/svg/SVGFETileElement.h

@@ -43 +43 @@
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
-
     void parseAttribute(const QualifiedName&, const AtomicString&) override;
     void svgAttributeChanged(const QualifiedName&) override;

trunk/Source/WebCore/svg/SVGFitToViewBox.h

@@ -67 +67 @@
     SVGFitToViewBox(SVGElement* contextElement, SVGPropertyAccess = SVGPropertyAccess::ReadWrite);
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
+    static bool isKnownAttribute(const QualifiedName& attributeName) { return PropertyRegistry::isKnownAttribute(attributeName); }
 
     void reset();

trunk/Source/WebCore/svg/SVGGradientElement.cpp

@@ -3 +3 @@
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -30 +30 @@
 #include "SVGNames.h"
 #include "SVGStopElement.h"
-#include "SVGTransformListValues.h"
 #include "SVGTransformable.h"
 #include "StyleResolver.h"
@@ -45 +44 @@
     , SVGURIReference(this)
 {
-    registerAttributes();
-
     static std::once_flag onceFlag;
     std::call_once(onceFlag, [] {
         PropertyRegistry::registerProperty<SVGNames::spreadMethodAttr, SVGSpreadMethodType, &SVGGradientElement::m_spreadMethod>();
         PropertyRegistry::registerProperty<SVGNames::gradientUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGGradientElement::m_gradientUnits>();
+        PropertyRegistry::registerProperty<SVGNames::gradientTransformAttr, &SVGGradientElement::m_gradientTransform>();
     });
-}
-
-void SVGGradientElement::registerAttributes()
-{
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute<SVGNames::gradientTransformAttr, &SVGGradientElement::m_gradientTransform>();
 }
 
@@ -72 +62 @@
 
     if (name == SVGNames::gradientTransformAttr) {
-        SVGTransformListValues newList;
-        newList.parse(value);
-        m_gradientTransform.detachAnimatedListWrappers(attributeOwnerProxy(), newList.size());
-        m_gradientTransform.setValue(WTFMove(newList));
+        m_gradientTransform->baseVal()->parse(value);
         return;
     }

trunk/Source/WebCore/svg/SVGGradientElement.h

@@ -23 +23 @@
 
 #include "Gradient.h"
-#include "SVGAnimatedTransformList.h"
 #include "SVGElement.h"
 #include "SVGExternalResourcesRequired.h"
@@ -91 +90 @@
     SVGSpreadMethodType spreadMethod() const { return m_spreadMethod->currentValue<SVGSpreadMethodType>(); }
     SVGUnitTypes::SVGUnitType gradientUnits() const { return m_gradientUnits->currentValue<SVGUnitTypes::SVGUnitType>(); }
-    const SVGTransformListValues& gradientTransform() const { return m_gradientTransform.currentValue(attributeOwnerProxy()); }
+    const SVGTransformList& gradientTransform() const { return m_gradientTransform->currentValue(); }
 
     SVGAnimatedEnumeration& spreadMethodAnimated() { return m_spreadMethod; }
     SVGAnimatedEnumeration& gradientUnitsAnimated() { return m_gradientUnits; }
-    RefPtr<SVGAnimatedTransformList> gradientTransformAnimated() { return m_gradientTransform.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedTransformList& gradientTransformAnimated() { return m_gradientTransform; }
 
 protected:
     SVGGradientElement(const QualifiedName&, Document&);
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
+    static bool isKnownAttribute(const QualifiedName& attributeName) { return PropertyRegistry::isKnownAttribute(attributeName); }
 
     void parseAttribute(const QualifiedName&, const AtomicString&) override;
@@ -113 +109 @@
 
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const override { return m_attributeOwnerProxy; }
-    static void registerAttributes();
-
     const SVGPropertyRegistry& propertyRegistry() const override { return m_propertyRegistry; }
 
@@ -121 +115 @@
     Ref<SVGAnimatedEnumeration> m_spreadMethod { SVGAnimatedEnumeration::create(this, SVGSpreadMethodPad) };
     Ref<SVGAnimatedEnumeration> m_gradientUnits { SVGAnimatedEnumeration::create(this, SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) };
-    SVGAnimatedTransformListAttribute m_gradientTransform;
+    Ref<SVGAnimatedTransformList> m_gradientTransform { SVGAnimatedTransformList::create(this) };
 };
 

trunk/Source/WebCore/svg/SVGGraphicsElement.cpp

@@ -43 +43 @@
     , m_shouldIsolateBlending(false)
 {
-    registerAttributes();
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        PropertyRegistry::registerProperty<SVGNames::transformAttr, &SVGGraphicsElement::m_transform>();
+    });
 }
 
@@ -107 +110 @@
 
     } else
-        transform().concatenate(matrix);
+        matrix = transform().concatenate();
 
     if (m_supplementalTransform)
@@ -121 +124 @@
 }
 
-void SVGGraphicsElement::registerAttributes()
-{
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute<SVGNames::transformAttr, &SVGGraphicsElement::m_transform>();
-}
-
 void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (name == SVGNames::transformAttr) {
-        SVGTransformListValues newList;
-        newList.parse(value);
-        m_transform.detachAnimatedListWrappers(attributeOwnerProxy(), newList.size());
-        m_transform.setValue(newList);
+        m_transform->baseVal()->parse(value);
         return;
     }
@@ -145 +137 @@
 void SVGGraphicsElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (isKnownAttribute(attrName)) {
+    if (attrName == SVGNames::transformAttr) {
         InstanceInvalidationGuard guard(*this);
 
-        auto renderer = this->renderer();
-        if (!renderer)
-            return;
-
-        if (attrName == SVGNames::transformAttr) {
+        if (auto renderer = this->renderer()) {
             renderer->setNeedsTransformUpdate();
             RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
-            return;
         }
+
+        return;
     }
 

trunk/Source/WebCore/svg/SVGGraphicsElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedTransformList.h"
 #include "SVGElement.h"
 #include "SVGTests.h"
@@ -69 +68 @@
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGGraphicsElement, SVGElement, SVGTests>;
 
-    const auto& transform() const { return m_transform.currentValue(attributeOwnerProxy()); }
-    auto transformAnimated() { return m_transform.animatedProperty(attributeOwnerProxy()); }
+    const SVGTransformList& transform() const { return m_transform->currentValue(); }
+    SVGAnimatedTransformList& transformAnimated() { return m_transform; }
 
 protected:
@@ -84 +83 @@
 
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const override { return m_attributeOwnerProxy; }
-    static void registerAttributes();
-
     const SVGPropertyRegistry& propertyRegistry() const override { return m_propertyRegistry; }
-
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
 
     // Used by <animateMotion>
@@ -101 +93 @@
     AttributeOwnerProxy m_attributeOwnerProxy { *this };
     PropertyRegistry m_propertyRegistry { *this };
-    SVGAnimatedTransformListAttribute m_transform;
+    Ref<SVGAnimatedTransformList> m_transform { SVGAnimatedTransformList::create(this) };
 };
 

trunk/Source/WebCore/svg/SVGLangSpace.cpp

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -34 +34 @@
     : m_contextElement(*contextElement)
 {
-    registerAttributes();
 }
 
-void SVGLangSpace::registerAttributes()
+const AtomicString& SVGLangSpace::xmlspace() const
 {
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute(SVGStringAttributeAccessor::singleton<XMLNames::langAttr, &SVGLangSpace::m_lang>());
-    registry.registerAttribute(SVGStringAttributeAccessor::singleton<XMLNames::spaceAttr, &SVGLangSpace::m_space>());
-}
-
-const String& SVGLangSpace::xmlspace() const
-{
-    if (!m_space.value()) {
-        static NeverDestroyed<String> defaultString("default");
+    if (!m_space) {
+        static NeverDestroyed<const AtomicString> defaultString("default", AtomicString::ConstructFromLiteral);
         return defaultString;
     }
-    return m_space.value();
+    return m_space;
+}
+    
+bool SVGLangSpace::isKnownAttribute(const QualifiedName& attributeName)
+{
+    return attributeName.matches(XMLNames::langAttr) || attributeName.matches(XMLNames::spaceAttr);
 }
 
@@ -63 +58 @@
 }
 
-void SVGLangSpace::svgAttributeChanged(const QualifiedName& attrName)
+void SVGLangSpace::svgAttributeChanged(const QualifiedName& attributeName)
 {
-    if (!isKnownAttribute(attrName))
+    if (!isKnownAttribute(attributeName))
         return;
 

trunk/Source/WebCore/svg/SVGLangSpace.h

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -23 +23 @@
 
 #include "QualifiedName.h"
-#include "SVGAttributeOwnerProxyImpl.h"
 #include <wtf/HashSet.h>
 
@@ -32 +31 @@
 class SVGLangSpace {
 public:
-    const String& xmllang() const { return m_lang.value(); }
-    void setXmllang(const AtomicString& xmlLang) { m_lang.setValue(xmlLang); }
+    const AtomicString& xmllang() const { return m_lang; }
+    void setXmllang(const AtomicString& xmlLang) { m_lang = xmlLang; }
 
-    const String& xmlspace() const;
-    void setXmlspace(const AtomicString& xmlSpace) { m_space.setValue(xmlSpace); }
+    const AtomicString& xmlspace() const;
+    void setXmlspace(const AtomicString& xmlSpace) { m_space = xmlSpace; }
 
     void parseAttribute(const QualifiedName&, const AtomicString&);
@@ -42 +41 @@
     void svgAttributeChanged(const QualifiedName&);
 
-    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGLangSpace>;
-    using AttributeRegistry = SVGAttributeRegistry<SVGLangSpace>;
-    static auto& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
-    static bool isKnownAttribute(const QualifiedName& attributeName) { return attributeRegistry().isKnownAttribute(attributeName); }
+    static bool isKnownAttribute(const QualifiedName&);
 
 protected:
@@ -51 +47 @@
 
 private:
-    using SVGStringAttribute = SVGPropertyAttribute<String>;
-    using SVGStringAttributeAccessor = SVGPropertyAttributeAccessor<SVGLangSpace, SVGStringAttribute>;
-    static void registerAttributes();
-
     SVGElement& m_contextElement;
-    SVGStringAttribute m_lang;
-    SVGStringAttribute m_space;
+    AtomicString m_lang;
+    AtomicString m_space;
 };
 

trunk/Source/WebCore/svg/SVGLinearGradientElement.cpp

@@ -104 +104 @@
         attributes.setGradientUnits(element.gradientUnits());
 
-    if (!attributes.hasGradientTransform() && element.hasAttribute(SVGNames::gradientTransformAttr)) {
-        AffineTransform transform;
-        element.gradientTransform().concatenate(transform);
-        attributes.setGradientTransform(transform);
-    }
+    if (!attributes.hasGradientTransform() && element.hasAttribute(SVGNames::gradientTransformAttr))
+        attributes.setGradientTransform(element.gradientTransform().concatenate());
 
     if (!attributes.hasStops()) {

trunk/Source/WebCore/svg/SVGMaskElement.h

@@ -52 +52 @@
 
     using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGMaskElement, SVGElement, SVGExternalResourcesRequired, SVGTests>;
-    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
-    static void registerAttributes();
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
 
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGMaskElement, SVGElement, SVGExternalResourcesRequired, SVGTests>;
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
-
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
 
     void parseAttribute(const QualifiedName&, const AtomicString&) final;

trunk/Source/WebCore/svg/SVGMatrix.h

@@ -27 +27 @@
 
 #include "AffineTransform.h"
-#include "SVGPropertyTearOff.h"
+#include "SVGValueProperty.h"
 
 namespace WebCore {
 
 // FIXME: Remove this class once SVGMatrix becomes an alias to DOMMatrix.
-class SVGMatrix : public SVGPropertyTearOff<AffineTransform> {
-    using Base = SVGPropertyTearOff<AffineTransform>;
+class SVGMatrix : public SVGValueProperty<AffineTransform> {
+    using Base = SVGValueProperty<AffineTransform>;
     using Base::Base;
 
 public:
-    static Ref<SVGMatrix> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, AffineTransform& value)
-    {
-        return adoptRef(*new SVGMatrix(&animatedProperty, role, value));
-    }
-
-    static Ref<SVGMatrix> create(const AffineTransform& initialValue = { })
-    {
-        return adoptRef(*new SVGMatrix(initialValue));
-    }
-
-    template<typename T> static ExceptionOr<Ref<SVGMatrix>> create(ExceptionOr<T>&& initialValue)
-    {
-        if (initialValue.hasException())
-            return initialValue.releaseException();
-        return create(initialValue.releaseReturnValue());
+    static Ref<SVGMatrix> create(const AffineTransform& value = { })
+    {
+        return adoptRef(*new SVGMatrix(value));
+    }
+
+    static Ref<SVGMatrix> create(SVGPropertyOwner* owner, SVGPropertyAccess access, const AffineTransform& value = { })
+    {
+        return adoptRef(*new SVGMatrix(owner, access, value));
+    }
+
+    template<typename T>
+    static ExceptionOr<Ref<SVGMatrix>> create(ExceptionOr<T>&& value)
+    {
+        if (value.hasException())
+            return value.releaseException();
+        return create(value.releaseReturnValue());
     }
 
     double a() const
     {
-        return propertyReference().a();
+        return m_value.a();
     }
 
@@ -64 +65 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setA(value);
-        commitChange();
-
+        m_value.setA(value);
+        commitChange();
         return { };
     }
@@ -72 +72 @@
     double b() const
     {
-        return propertyReference().b();
+        return m_value.b();
     }
 
@@ -80 +80 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setB(value);
-        commitChange();
-
+        m_value.setB(value);
+        commitChange();
         return { };
     }
@@ -88 +87 @@
     double c() const
     {
-        return propertyReference().c();
+        return m_value.c();
     }
 
@@ -96 +95 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setC(value);
-        commitChange();
-
+        m_value.setC(value);
+        commitChange();
         return { };
     }
@@ -104 +102 @@
     double d() const
     {
-        return propertyReference().d();
+        return m_value.d();
     }
 
@@ -112 +110 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setD(value);
-        commitChange();
-
+        m_value.setD(value);
+        commitChange();
         return { };
     }
@@ -120 +117 @@
     double e() const
     {
-        return propertyReference().e();
+        return m_value.e();
     }
 
@@ -128 +125 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setE(value);
-        commitChange();
-
+        m_value.setE(value);
+        commitChange();
         return { };
     }
@@ -136 +132 @@
     double f() const
     {
-        return propertyReference().f();
+        return m_value.f();
     }
 
@@ -144 +140 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setF(value);
-        commitChange();
-
+        m_value.setF(value);
+        commitChange();
         return { };
     }
@@ -152 +147 @@
     Ref<SVGMatrix> multiply(SVGMatrix& secondMatrix) const
     {
-        auto copy = propertyReference();
-        copy.multiply(secondMatrix.propertyReference());
+        auto copy = m_value;
+        copy.multiply(secondMatrix.value());
         return SVGMatrix::create(copy);
     }
@@ -159 +154 @@
     ExceptionOr<Ref<SVGMatrix>> inverse() const
     {
-        auto inverse = propertyReference().inverse();
+        auto inverse = m_value.inverse();
         if (!inverse)
             return Exception { InvalidStateError, "Matrix is not invertible"_s };
-
         return SVGMatrix::create(*inverse);
     }
@@ -168 +162 @@
     Ref<SVGMatrix> translate(float x, float y) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.translate(x, y);
         return SVGMatrix::create(copy);
@@ -175 +169 @@
     Ref<SVGMatrix> scale(float scaleFactor) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.scale(scaleFactor);
         return SVGMatrix::create(copy);
@@ -182 +176 @@
     Ref<SVGMatrix> scaleNonUniform(float scaleFactorX, float scaleFactorY) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.scaleNonUniform(scaleFactorX, scaleFactorY);
         return SVGMatrix::create(copy);
@@ -189 +183 @@
     Ref<SVGMatrix> rotate(float angle) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.rotate(angle);
         return SVGMatrix::create(copy);
@@ -199 +193 @@
             return Exception { TypeError };
 
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.rotateFromVector(x, y);
         return SVGMatrix::create(copy);
@@ -206 +200 @@
     Ref<SVGMatrix> flipX() const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.flipX();
         return SVGMatrix::create(copy);
@@ -213 +207 @@
     Ref<SVGMatrix> flipY() const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.flipY();
         return SVGMatrix::create(copy);
@@ -220 +214 @@
     Ref<SVGMatrix> skewX(float angle) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.skewX(angle);
         return SVGMatrix::create(copy);
@@ -227 +221 @@
     Ref<SVGMatrix> skewY(float angle) const
     {
-        auto copy = propertyReference();
+        auto copy = m_value;
         copy.skewY(angle);
         return SVGMatrix::create(copy);

trunk/Source/WebCore/svg/SVGPatternElement.cpp

@@ -54 +54 @@
 {
     ASSERT(hasTagName(SVGNames::patternTag));
-    registerAttributes();
 
     static std::once_flag onceFlag;
@@ -64 +63 @@
         PropertyRegistry::registerProperty<SVGNames::patternUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGPatternElement::m_patternUnits>();
         PropertyRegistry::registerProperty<SVGNames::patternContentUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGPatternElement::m_patternContentUnits>();
+        PropertyRegistry::registerProperty<SVGNames::patternTransformAttr, &SVGPatternElement::m_patternTransform>();
     });
 }
@@ -70 +70 @@
 {
     return adoptRef(*new SVGPatternElement(tagName, document));
-}
-
-void SVGPatternElement::registerAttributes()
-{
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute<SVGNames::patternTransformAttr, &SVGPatternElement::m_patternTransform>();
 }
 
@@ -95 +87 @@
     }
     if (name == SVGNames::patternTransformAttr) {
-        SVGTransformListValues newList;
-        newList.parse(value);
-        m_patternTransform.detachAnimatedListWrappers(attributeOwnerProxy(), newList.size());
-        m_patternTransform.setValue(WTFMove(newList));
+        m_patternTransform->baseVal()->parse(value);
         return;
     }
@@ -130 +119 @@
     }
 
-    if (isKnownAttribute(attrName) || SVGFitToViewBox::isKnownAttribute(attrName) || SVGURIReference::isKnownAttribute(attrName)) {
+    if (PropertyRegistry::isKnownAttribute(attrName) || SVGFitToViewBox::isKnownAttribute(attrName) || SVGURIReference::isKnownAttribute(attrName)) {
         if (RenderObject* object = renderer())
             object->setNeedsLayout();
@@ -182 +171 @@
         attributes.setPatternContentUnits(patternContentUnits());
 
-    if (!attributes.hasPatternTransform() && hasAttribute(SVGNames::patternTransformAttr)) {
-        AffineTransform transform;
-        patternTransform().concatenate(transform);
-        attributes.setPatternTransform(transform);
-    }
+    if (!attributes.hasPatternTransform() && hasAttribute(SVGNames::patternTransformAttr))
+        attributes.setPatternTransform(patternTransform().concatenate());
 
     if (!attributes.hasPatternContentElement() && childElementCount())
@@ -194 +180 @@
 AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
 {
-    AffineTransform matrix;
-    patternTransform().concatenate(matrix);
-    return matrix;
+    return patternTransform().concatenate();
 }
 

trunk/Source/WebCore/svg/SVGPatternElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedTransformList.h"
 #include "SVGElement.h"
 #include "SVGExternalResourcesRequired.h"
@@ -50 +49 @@
     SVGUnitTypes::SVGUnitType patternUnits() const { return m_patternUnits->currentValue<SVGUnitTypes::SVGUnitType>(); }
     SVGUnitTypes::SVGUnitType patternContentUnits() const { return m_patternContentUnits->currentValue<SVGUnitTypes::SVGUnitType>(); }
-    const SVGTransformListValues& patternTransform() const { return m_patternTransform.currentValue(attributeOwnerProxy()); }
+    const SVGTransformList& patternTransform() const { return m_patternTransform->currentValue(); }
 
     SVGAnimatedLength& xAnimated() { return m_x; }
@@ -58 +57 @@
     SVGAnimatedEnumeration& patternUnitsAnimated() { return m_patternUnits; }
     SVGAnimatedEnumeration& patternContentUnitsAnimated() { return m_patternContentUnits; }
-    RefPtr<SVGAnimatedTransformList> patternTransformAnimated() { return m_patternTransform.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedTransformList& patternTransformAnimated() { return m_patternTransform; }
 
 private:
@@ -64 +63 @@
 
     using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGPatternElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGTests, SVGURIReference>;
-    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
-    static void registerAttributes();
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
 
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGPatternElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGTests, SVGURIReference>;
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
-
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
 
     void parseAttribute(const QualifiedName&, const AtomicString&) final;
@@ -94 +86 @@
     Ref<SVGAnimatedEnumeration> m_patternUnits { SVGAnimatedEnumeration::create(this, SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) };
     Ref<SVGAnimatedEnumeration> m_patternContentUnits { SVGAnimatedEnumeration::create(this, SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) };
-    SVGAnimatedTransformListAttribute m_patternTransform;
+    Ref<SVGAnimatedTransformList> m_patternTransform { SVGAnimatedTransformList::create(this) };
 };
 

trunk/Source/WebCore/svg/SVGPoint.h

@@ -85 +85 @@
     Ref<SVGPoint> matrixTransform(SVGMatrix& matrix) const
     {
-        auto newPoint = m_value.matrixTransform(matrix.propertyReference());
+        auto newPoint = m_value.matrixTransform(matrix.value());
         return adoptRef(*new SVGPoint(newPoint));
     }

trunk/Source/WebCore/svg/SVGPolyElement.h

@@ -48 +48 @@
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
 
-    static bool isKnownAttribute(const QualifiedName& attributeName)
-    {
-        return AttributeOwnerProxy::isKnownAttribute(attributeName) || PropertyRegistry::isKnownAttribute(attributeName);
-    }
-
     void parseAttribute(const QualifiedName&, const AtomicString&) override; 
     void svgAttributeChanged(const QualifiedName&) override;

trunk/Source/WebCore/svg/SVGRadialGradientElement.cpp

@@ -110 +110 @@
         attributes.setGradientUnits(element.gradientUnits());
 
-    if (!attributes.hasGradientTransform() && element.hasAttribute(SVGNames::gradientTransformAttr)) {
-        AffineTransform transform;
-        element.gradientTransform().concatenate(transform);
-        attributes.setGradientTransform(transform);
-    }
+    if (!attributes.hasGradientTransform() && element.hasAttribute(SVGNames::gradientTransformAttr))
+        attributes.setGradientTransform(element.gradientTransform().concatenate());
 
     if (!attributes.hasStops()) {

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -387 +387 @@
 Ref<SVGTransform> SVGSVGElement::createSVGTransform()
 {
-    return SVGTransform::create(SVGTransformValue { SVGTransformValue::SVG_TRANSFORM_MATRIX });
+    return SVGTransform::create(SVGTransformValue::SVG_TRANSFORM_MATRIX);
 }
 
 Ref<SVGTransform> SVGSVGElement::createSVGTransformFromMatrix(SVGMatrix& matrix)
 {
-    return SVGTransform::create(SVGTransformValue { matrix.propertyReference() });
+    return SVGTransform::create(matrix.value());
 }
 
@@ -609 +609 @@
 
     AffineTransform transform = SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(), m_viewSpec->preserveAspectRatio(), viewWidth, viewHeight);
-    m_viewSpec->transformValue().concatenate(transform);
+    transform *= m_viewSpec->transform()->concatenate();
     return transform;
 }

trunk/Source/WebCore/svg/SVGTextElement.cpp

@@ -60 +60 @@
         matrix = t.toAffineTransform();
     } else
-        transform().concatenate(matrix);
+        matrix = transform().concatenate();
 
     const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supplementalTransform();

trunk/Source/WebCore/svg/SVGTransform.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 
 #include "SVGMatrix.h"
-#include "SVGPropertyTearOff.h"
 #include "SVGTransformValue.h"
+#include "SVGValueProperty.h"
 
 namespace WebCore {
 
-class SVGTransform : public SVGPropertyTearOff<SVGTransformValue> {
+class SVGTransform : public SVGValueProperty<SVGTransformValue>, public SVGPropertyOwner {
 public:
-    static Ref<SVGTransform> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value)
+    static Ref<SVGTransform> create(SVGTransformValue::SVGTransformType type)
     {
-        return adoptRef(*new SVGTransform(animatedProperty, role, value));
+        return adoptRef(*new SVGTransform(type));
     }
 
-    static Ref<SVGTransform> create(const SVGTransformValue& initialValue = { })
+    static Ref<SVGTransform> create(const AffineTransform& transform = { })
     {
-        return adoptRef(*new SVGTransform(initialValue));
+        return adoptRef(*new SVGTransform(SVGTransformValue::SVG_TRANSFORM_MATRIX, transform));
     }
 
-    template<typename T> static ExceptionOr<Ref<SVGTransform>> create(ExceptionOr<T>&& initialValue)
+    static Ref<SVGTransform> create(const SVGTransformValue& value)
     {
-        if (initialValue.hasException())
-            return initialValue.releaseException();
-        return create(initialValue.releaseReturnValue());
+        return adoptRef(*new SVGTransform(value.type(), value.matrix()->value(), value.angle(), value.rotationCenter()));
     }
 
-    unsigned short type()
+    template<typename T>
+    static ExceptionOr<Ref<SVGTransform>> create(ExceptionOr<T>&& value)
     {
-        return propertyReference().type();
+        if (value.hasException())
+            return value.releaseException();
+        return create(value.releaseReturnValue());
     }
 
-    Ref<SVGMatrix> matrix();
+    ~SVGTransform()
+    {
+        m_value.matrix()->detach();
+    }
 
-    float angle()
+    Ref<SVGTransform> clone() const
     {
-        return propertyReference().angle();
+        return SVGTransform::create(m_value);
     }
+
+    unsigned short type() { return m_value.type(); }
+    float angle() { return m_value.angle(); }
+    const Ref<SVGMatrix>& matrix() { return m_value.matrix(); }
 
     ExceptionOr<void> setMatrix(SVGMatrix& matrix)
@@ -68 +76 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setMatrix(matrix.propertyReference());
+        m_value.setMatrix(matrix.value());
         commitChange();
-
         return { };
     }
@@ -79 +86 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setTranslate(tx, ty);
+        m_value.setTranslate(tx, ty);
         commitChange();
-
         return { };
     }
@@ -90 +96 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setScale(sx, sy);
+        m_value.setScale(sx, sy);
         commitChange();
-
         return { };
     }
@@ -101 +106 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setRotate(angle, cx, cy);
+        m_value.setRotate(angle, cx, cy);
         commitChange();
-
         return { };
     }
@@ -112 +116 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setSkewX(angle);
+        m_value.setSkewX(angle);
         commitChange();
-
         return { };
     }
@@ -123 +126 @@
             return Exception { NoModificationAllowedError };
 
-        propertyReference().setSkewY(angle);
+        m_value.setSkewY(angle);
         commitChange();
-
         return { };
     }
 
 private:
-    SVGTransform(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value)
-        : SVGPropertyTearOff<SVGTransformValue>(&animatedProperty, role, value)
+    using Base = SVGValueProperty<SVGTransformValue>;
+
+    SVGTransform(SVGTransformValue::SVGTransformType type, const AffineTransform& transform = { }, float angle = 0, const FloatPoint& rotationCenter = { })
+        : Base(SVGTransformValue(type, SVGMatrix::create(this, SVGPropertyAccess::ReadWrite, transform), angle, rotationCenter))
     {
     }
 
-    explicit SVGTransform(const SVGTransformValue& initialValue)
-        : SVGPropertyTearOff<SVGTransformValue>(initialValue)
+    SVGPropertyOwner* owner() const override { return m_owner; }
+
+    void commitPropertyChange(SVGProperty* property) override
     {
+        ASSERT_UNUSED(property, property == m_value.matrix().ptr());
+        if (owner())
+            owner()->commitPropertyChange(this);
+        m_value.matrixDidChange();
+    }
+
+    String valueAsString() const override
+    {
+        return m_value.valueAsString();
     }
 };

trunk/Source/WebCore/svg/SVGTransform.idl

@@ -33 +33 @@
 
     readonly attribute unsigned short type;
-    [NewObject] readonly attribute SVGMatrix matrix;
+    readonly attribute SVGMatrix matrix;
     readonly attribute unrestricted float angle;
 

trunk/Source/WebCore/svg/SVGTransformList.h

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -21 +22 @@
 #pragma once
 
-#include "SVGAnimatedListPropertyTearOff.h"
-#include "SVGListPropertyTearOff.h"
-#include "SVGTransformListValues.h"
+#include "SVGTransform.h"
+#include "SVGTransformable.h"
+#include "SVGValuePropertyList.h"
 
 namespace WebCore {
 
-class SVGTransformList final : public SVGListPropertyTearOff<SVGTransformListValues> {
+class SVGTransformList final : public SVGValuePropertyList<SVGTransform> {
+    friend class SVGViewSpec;
+    using Base = SVGValuePropertyList<SVGTransform>;
+    using Base::Base;
+
 public:
-    using AnimatedListPropertyTearOff = SVGAnimatedListPropertyTearOff<SVGTransformListValues>;
-    using ListWrapperCache = AnimatedListPropertyTearOff::ListWrapperCache;
-
-    static Ref<SVGTransformList> create(AnimatedListPropertyTearOff& animatedProperty, SVGPropertyRole role, SVGTransformListValues& values, ListWrapperCache& wrappers)
+    static Ref<SVGTransformList> create()
     {
-        return adoptRef(*new SVGTransformList(animatedProperty, role, values, wrappers));
+        return adoptRef(*new SVGTransformList());
     }
 
-    ExceptionOr<Ref<SVGTransform>> createSVGTransformFromMatrix(SVGMatrix& matrix)
+    static Ref<SVGTransformList> create(SVGPropertyOwner* owner, SVGPropertyAccess access)
     {
-        ASSERT(m_values);
-        return m_values->createSVGTransformFromMatrix(matrix);
+        return adoptRef(*new SVGTransformList(owner, access));
+    }
+
+    static Ref<SVGTransformList> create(const SVGTransformList& other, SVGPropertyAccess access)
+    {
+        return adoptRef(*new SVGTransformList(other, access));
+    }
+
+    ExceptionOr<Ref<SVGTransform>> createSVGTransformFromMatrix(const Ref<SVGMatrix>& matrix)
+    {
+        return SVGTransform::create(matrix->value());
     }
 
     ExceptionOr<RefPtr<SVGTransform>> consolidate()
     {
-        ASSERT(m_values);
-        ASSERT(m_wrappers);
-
         auto result = canAlterList();
         if (result.hasException())
@@ -53 +61 @@
         ASSERT(result.releaseReturnValue());
 
-        ASSERT(m_values->size() == m_wrappers->size());
-
         // Spec: If the list was empty, then a value of null is returned.
-        if (m_values->isEmpty())
+        if (m_items.isEmpty())
             return nullptr;
 
-        detachListWrappers(0);
-        
-        RefPtr<SVGTransform> wrapper = m_values->consolidate();
-        m_wrappers->append(makeWeakPtr(*wrapper));
+        if (m_items.size() == 1)
+            return makeRefPtr(at(0).get());
 
-        ASSERT(m_values->size() == m_wrappers->size());
-        return wrapper;
+        auto newItem = SVGTransform::create(concatenate());
+        clearItems();
+
+        auto item = append(WTFMove(newItem));
+        commitChange();
+        return makeRefPtr(item.get());
+    }
+
+    void parse(const String& value)
+    {
+        clearItems();
+
+        auto upconvertedCharacters = StringView(value).upconvertedCharacters();
+        const UChar* start = upconvertedCharacters;
+        if (!parse(start, start + value.length()))
+            clearItems();
+    }
+
+    AffineTransform concatenate() const
+    {
+        AffineTransform result;
+        for (const auto& transform : m_items)
+            result *= transform->matrix()->value();
+        return result;
+    }
+
+    String valueAsString() const override
+    {
+        StringBuilder builder;
+        for (const auto& transfrom : m_items) {
+            if (builder.length())
+                builder.append(' ');
+
+            builder.append(transfrom->value().valueAsString());
+        }
+        return builder.toString();
     }
 
 private:
-    SVGTransformList(AnimatedListPropertyTearOff& animatedProperty, SVGPropertyRole role, SVGTransformListValues& values, ListWrapperCache& wrappers)
-        : SVGListPropertyTearOff<SVGTransformListValues>(animatedProperty, role, values, wrappers)
+    bool parse(const UChar*& start, const UChar* end)
     {
+        bool delimParsed = false;
+        while (start < end) {
+            delimParsed = false;
+            SVGTransformValue::SVGTransformType type = SVGTransformValue::SVG_TRANSFORM_UNKNOWN;
+            skipOptionalSVGSpaces(start, end);
+
+            if (!SVGTransformable::parseAndSkipType(start, end, type))
+                return false;
+
+            Ref<SVGTransform> transform = SVGTransform::create(type);
+            if (!SVGTransformable::parseTransformValue(type, start, end, transform->value()))
+                return false;
+
+            append(WTFMove(transform));
+            skipOptionalSVGSpaces(start, end);
+            if (start < end && *start == ',') {
+                delimParsed = true;
+                ++start;
+            }
+
+            skipOptionalSVGSpaces(start, end);
+        }
+        return !delimParsed;
     }
 };

trunk/Source/WebCore/svg/SVGTransformList.idl

@@ -37 +37 @@
 
     [MayThrowException, NewObject] SVGTransform createSVGTransformFromMatrix(SVGMatrix matrix);
-    [MayThrowException, NewObject] SVGTransform consolidate();
+    [MayThrowException] SVGTransform consolidate();
 };

trunk/Source/WebCore/svg/SVGTransformValue.h

@@ -22 +22 @@
 #pragma once
 
-#include "AffineTransform.h"
+#include "FloatConversion.h"
 #include "FloatPoint.h"
+#include "FloatSize.h"
+#include "SVGMatrix.h"
+#include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -46 +51 @@
     };
 
-    SVGTransformValue();
-    SVGTransformValue(SVGTransformType, ConstructionMode = ConstructIdentityTransform);
-    explicit SVGTransformValue(const AffineTransform&);
+    SVGTransformValue(SVGTransformType type = SVG_TRANSFORM_MATRIX, const AffineTransform& transform = { })
+        : m_type(type)
+        , m_matrix(SVGMatrix::create(transform))
+    {
+    }
+
+    SVGTransformValue(const SVGTransformValue& other)
+        : m_type(other.m_type)
+        , m_matrix(SVGMatrix::create(other.matrix()->value()))
+        , m_angle(other.m_angle)
+        , m_rotationCenter(other.m_rotationCenter)
+    {
+    }
+
+    SVGTransformValue(SVGTransformType type, Ref<SVGMatrix>&& matrix, float angle, const FloatPoint& rotationCenter)
+        : m_type(type)
+        , m_matrix(WTFMove(matrix))
+        , m_angle(angle)
+        , m_rotationCenter(rotationCenter)
+    {
+    }
+
+    SVGTransformValue(SVGTransformValue&& other)
+        : m_type(other.m_type)
+        , m_matrix(other.m_matrix.copyRef())
+        , m_angle(other.m_angle)
+        , m_rotationCenter(other.m_rotationCenter)
+    {
+    }
+
+    SVGTransformValue& operator=(const SVGTransformValue& other)
+    {
+        m_type = other.m_type;
+        m_matrix->setValue(other.m_matrix->value());
+        m_angle = other.m_angle;
+        m_rotationCenter = other.m_rotationCenter;
+        return *this;
+    }
 
     SVGTransformType type() const { return m_type; }
-
-    const AffineTransform& matrix() const { return m_matrix; }
-    AffineTransform& matrix() { return m_matrix; }
-    void updateSVGMatrix();
-
+    const Ref<SVGMatrix>& matrix() const { return m_matrix; }
     float angle() const { return m_angle; }
-    FloatPoint rotationCenter() const { return m_center; }
-
-    void setMatrix(const AffineTransform&);
-    void setTranslate(float tx, float ty);
-    void setScale(float sx, float sy);
-    void setRotate(float angle, float cx, float cy);
-    void setSkewX(float angle);
-    void setSkewY(float angle);
-    
-    FloatPoint translate() const;
-    FloatSize scale() const;
+    FloatPoint rotationCenter() const { return m_rotationCenter; }
 
     bool isValid() const { return m_type != SVG_TRANSFORM_UNKNOWN; }
-    String valueAsString() const;
-
-    static const String& transformTypePrefixForParsing(SVGTransformType);
+
+    void setMatrix(const AffineTransform& matrix)
+    {
+        m_type = SVG_TRANSFORM_MATRIX;
+        m_angle = 0;
+        m_rotationCenter = FloatPoint();
+        m_matrix->setValue(matrix);
+    }
+
+    void matrixDidChange()
+    {
+        // The underlying matrix has been changed, alter the transformation type.
+        // Spec: In case the matrix object is changed directly (i.e., without using the methods on the SVGTransform interface itself)
+        // then the type of the SVGTransform changes to SVG_TRANSFORM_MATRIX.
+        m_type = SVG_TRANSFORM_MATRIX;
+        m_angle = 0;
+        m_rotationCenter = FloatPoint();
+    }
+
+    FloatPoint translate() const
+    {
+        return FloatPoint::narrowPrecision(m_matrix->e(), m_matrix->f());
+    }
+
+    void setTranslate(float tx, float ty)
+    {
+        m_type = SVG_TRANSFORM_TRANSLATE;
+        m_angle = 0;
+        m_rotationCenter = FloatPoint();
+        
+        m_matrix->value().makeIdentity();
+        m_matrix->value().translate(tx, ty);
+    }
+
+    FloatSize scale() const
+    {
+        return FloatSize::narrowPrecision(m_matrix->a(), m_matrix->d());
+    }
+
+    void setScale(float sx, float sy)
+    {
+        m_type = SVG_TRANSFORM_SCALE;
+        m_angle = 0;
+        m_rotationCenter = FloatPoint();
+        
+        m_matrix->value().makeIdentity();
+        m_matrix->value().scaleNonUniform(sx, sy);
+    }
+
+    void setRotate(float angle, float cx, float cy)
+    {
+        m_type = SVG_TRANSFORM_ROTATE;
+        m_angle = angle;
+        m_rotationCenter = FloatPoint(cx, cy);
+
+        // TODO: toString() implementation, which can show cx, cy (need to be stored?)
+        m_matrix->value().makeIdentity();
+        m_matrix->value().translate(cx, cy);
+        m_matrix->value().rotate(angle);
+        m_matrix->value().translate(-cx, -cy);
+    }
+
+    void setSkewX(float angle)
+    {
+        m_type = SVG_TRANSFORM_SKEWX;
+        m_angle = angle;
+        m_rotationCenter = FloatPoint();
+        
+        m_matrix->value().makeIdentity();
+        m_matrix->value().skewX(angle);
+    }
+
+    void setSkewY(float angle)
+    {
+        m_type = SVG_TRANSFORM_SKEWY;
+        m_angle = angle;
+        m_rotationCenter = FloatPoint();
+        
+        m_matrix->value().makeIdentity();
+        m_matrix->value().skewY(angle);
+    }
+
+    String valueAsString() const
+    {
+        StringBuilder builder;
+        builder.append(prefixForTransfromType(m_type));
+        switch (m_type) {
+        case SVG_TRANSFORM_UNKNOWN:
+            break;
+        case SVG_TRANSFORM_MATRIX:
+            appendMatrix(builder);
+            break;
+        case SVG_TRANSFORM_TRANSLATE:
+            appendTranslate(builder);
+            break;
+        case SVG_TRANSFORM_SCALE:
+            appendScale(builder);
+            break;
+        case SVG_TRANSFORM_ROTATE:
+            appendRotate(builder);
+            break;
+        case SVG_TRANSFORM_SKEWX:
+            appendSkewX(builder);
+            break;
+        case SVG_TRANSFORM_SKEWY:
+            appendSkewY(builder);
+            break;
+        }
+        return builder.toString();
+    }
+
+    static String prefixForTransfromType(SVGTransformType type)
+    {
+        switch (type) {
+        case SVG_TRANSFORM_UNKNOWN:
+            return emptyString();
+        case SVG_TRANSFORM_MATRIX:
+            return "matrix("_s;
+        case SVG_TRANSFORM_TRANSLATE:
+            return "translate("_s;
+        case SVG_TRANSFORM_SCALE:
+            return "scale("_s;
+        case SVG_TRANSFORM_ROTATE:
+            return "rotate("_s;
+        case SVG_TRANSFORM_SKEWX:
+            return "skewX("_s;
+        case SVG_TRANSFORM_SKEWY:
+            return "skewY("_s;
+        }
+        ASSERT_NOT_REACHED();
+        return emptyString();
+    }
 
 private:
+    static void appendNumbers(StringBuilder& builder)
+    {
+        builder.append(')');
+    }
+
+    template<typename Number, typename... Numbers>
+    static void appendNumbers(StringBuilder& builder, Number number, Numbers... numbers)
+    {
+        if (builder.length() && builder[builder.length() - 1] != '(')
+            builder.append(' ');
+        builder.appendNumber(number);
+        appendNumbers(builder, numbers...);
+    }
+
+    void appendMatrix(StringBuilder& builder) const
+    {
+        appendNumbers(builder, m_matrix->a(), m_matrix->b(), m_matrix->c(), m_matrix->d(), m_matrix->e(), m_matrix->f());
+    }
+
+    void appendTranslate(StringBuilder& builder) const
+    {
+        appendNumbers(builder, m_matrix->e(), m_matrix->f());
+    }
+
+    void appendScale(StringBuilder& builder) const
+    {
+        appendNumbers(builder, m_matrix->value().xScale(), m_matrix->value().yScale());
+    }
+
+    void appendRotate(StringBuilder& builder) const
+    {
+        double angleInRad = deg2rad(m_angle);
+        double cosAngle = std::cos(angleInRad);
+        double sinAngle = std::sin(angleInRad);
+
+        float cx = narrowPrecisionToFloat(cosAngle != 1 ? (m_matrix->e() * (1 - cosAngle) - m_matrix->f() * sinAngle) / (1 - cosAngle) / 2 : 0);
+        float cy = narrowPrecisionToFloat(cosAngle != 1 ? (m_matrix->e() * sinAngle / (1 - cosAngle) + m_matrix->f()) / 2 : 0);
+
+        if (cx || cy)
+            appendNumbers(builder, m_angle, cx, cy);
+        else
+            appendNumbers(builder, m_angle);
+    }
+
+    void appendSkewX(StringBuilder& builder) const
+    {
+        appendNumbers(builder, m_angle);
+    }
+
+    void appendSkewY(StringBuilder& builder) const
+    {
+        appendNumbers(builder, m_angle);
+    }
+
     SVGTransformType m_type { SVG_TRANSFORM_UNKNOWN };
+    Ref<SVGMatrix> m_matrix;
     float m_angle { 0 };
-    FloatPoint m_center;
-    AffineTransform m_matrix;
+    FloatPoint m_rotationCenter;
 };
 

trunk/Source/WebCore/svg/SVGTransformable.cpp

@@ -28 +28 @@
 #include "SVGNames.h"
 #include "SVGParserUtilities.h"
-#include "SVGTransformListValues.h"
 #include <wtf/text/StringView.h>
 
@@ -145 +144 @@
 static const UChar matrixDesc[] =  {'m', 'a', 't', 'r', 'i', 'x'};
 
-static inline bool parseAndSkipType(const UChar*& currTransform, const UChar* end, SVGTransformValue::SVGTransformType& type)
+bool SVGTransformable::parseAndSkipType(const UChar*& currTransform, const UChar* end, SVGTransformValue::SVGTransformType& type)
 {
     if (currTransform >= end)
@@ -180 +179 @@
 }
 
-bool SVGTransformable::parseTransformAttribute(SVGTransformListValues& list, const UChar*& currTransform, const UChar* end, TransformParsingMode mode)
-{
-    if (mode == ClearList)
-        list.clear();
-
-    bool delimParsed = false;
-    while (currTransform < end) {
-        delimParsed = false;
-        SVGTransformValue::SVGTransformType type = SVGTransformValue::SVG_TRANSFORM_UNKNOWN;
-        skipOptionalSVGSpaces(currTransform, end);
-
-        if (!parseAndSkipType(currTransform, end, type))
-            return false;
-
-        SVGTransformValue transform;
-        if (!parseTransformValue(type, currTransform, end, transform))
-            return false;
-
-        list.append(transform);
-        skipOptionalSVGSpaces(currTransform, end);
-        if (currTransform < end && *currTransform == ',') {
-            delimParsed = true;
-            ++currTransform;
-        }
-        skipOptionalSVGSpaces(currTransform, end);
-    }
-
-    return !delimParsed;
 }
-
-}

trunk/Source/WebCore/svg/SVGTransformable.h

@@ -28 +28 @@
     
 class AffineTransform;
-class SVGTransformListValues;
 
 class SVGTransformable : public SVGLocatable {
 public:
-    enum TransformParsingMode {
-        ClearList,
-        DoNotClearList
-    };
-
     virtual ~SVGTransformable();
 
-    static bool parseTransformAttribute(SVGTransformListValues&, const UChar*& ptr, const UChar* end, TransformParsingMode = ClearList);
     static bool parseTransformValue(SVGTransformValue::SVGTransformType, const UChar*& ptr, const UChar* end, SVGTransformValue&);
     static SVGTransformValue::SVGTransformType parseTransformType(const String&);
+    static bool parseAndSkipType(const UChar*& currTransform, const UChar* end, SVGTransformValue::SVGTransformType&);
 
     AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const override { return animatedLocalTransform(); }

trunk/Source/WebCore/svg/SVGViewSpec.cpp

@@ -23 +23 @@
 
 #include "Document.h"
-#include "SVGAnimatedTransformList.h"
 #include "SVGElement.h"
 #include "SVGFitToViewBox.h"
@@ -37 +36 @@
     , m_contextElement(makeWeakPtr(contextElement))
     , m_attributeOwnerProxy(*this, contextElement)
+    , m_transform(SVGTransformList::create(&contextElement, SVGPropertyAccess::ReadOnly))
 {
-    registerAttributes();
-}
-
-void SVGViewSpec::registerAttributes()
-{
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute<SVGNames::transformAttr, &SVGViewSpec::m_transform>();
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        PropertyRegistry::registerProperty<SVGNames::transformAttr, &SVGViewSpec::m_transform>();
+    });
 }
 
@@ -59 +54 @@
 }
 
-RefPtr<SVGTransformList> SVGViewSpec::transform()
-{
-    if (!m_contextElement)
-        return nullptr;
-    // Return the animVal here, as its readonly by default - which is exactly what we want here.
-    return m_transform.animatedProperty(m_attributeOwnerProxy)->animVal();
-}
-
 void SVGViewSpec::reset()
 {
     m_viewTargetString = emptyString();
-    m_transform.resetValue();
+    m_transform->clearItems();
     SVGFitToViewBox::reset();
     SVGZoomAndPan::reset();
@@ -153 +140 @@
                 return false;
             currViewSpec++;
-            SVGTransformable::parseTransformAttribute(m_transform.value(), currViewSpec, end, SVGTransformable::DoNotClearList);
+            m_transform->parse(currViewSpec, end);
             if (currViewSpec >= end || *currViewSpec != ')')
                 return false;

trunk/Source/WebCore/svg/SVGViewSpec.h

@@ -22 +22 @@
 
 #include "SVGFitToViewBox.h"
-#include "SVGTransformListValues.h"
 #include "SVGZoomAndPan.h"
 
@@ -44 +43 @@
     const String& viewTargetString() const { return m_viewTargetString; }
 
-    String transformString() const { return m_transform.toString(); }
-    RefPtr<SVGTransformList> transform();
-    SVGTransformListValues transformValue() const { return m_transform.value(); }
+    String transformString() const { return m_transform->valueAsString(); }
+    Ref<SVGTransformList>& transform() { return m_transform; }
 
     const WeakPtr<SVGElement>& contextElementConcurrently() const { return m_contextElement; }
@@ -54 +52 @@
 
     using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGViewSpec, SVGFitToViewBox>;
-    static void registerAttributes();
-
-    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
-    static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
-
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGViewSpec, SVGFitToViewBox>;
 
@@ -64 +57 @@
     String m_viewTargetString;
     AttributeOwnerProxy m_attributeOwnerProxy;
-    SVGAnimatedTransformListAttribute m_transform;
+    Ref<SVGTransformList> m_transform;
 };
 

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

@@ -320 +320 @@
 };
 
+template<typename OwnerType>
+class SVGAnimatedTransformListAccessor final : public SVGAnimatedPropertyAccessor<OwnerType, SVGAnimatedTransformList> {
+    using Base = SVGAnimatedPropertyAccessor<OwnerType, SVGAnimatedTransformList>;
+    using Base::property;
+
+public:
+    using Base::Base;
+    template<Ref<SVGAnimatedTransformList> OwnerType::*property>
+    constexpr static const SVGMemberAccessor<OwnerType>& singleton() { return Base::template singleton<SVGAnimatedTransformListAccessor, property>(); }
+
+private:
+    std::unique_ptr<SVGAttributeAnimator> createAnimator(OwnerType& owner, const QualifiedName& attributeName, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive) const final
+    {
+        return SVGAnimatedTransformListAnimator::create(attributeName, property(owner), animationMode, calcMode, isAccumulated, isAdditive);
+    }
+
+    void appendAnimatedInstance(OwnerType& owner, SVGAttributeAnimator& animator) const final
+    {
+        static_cast<SVGAnimatedTransformListAnimator&>(animator).appendAnimatedInstance(property(owner));
+    }
+};
+
 }

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

@@ -309 +309 @@
 };
 
+class SVGAnimatedTransformListAnimator final : public SVGAnimatedPropertyAnimator<SVGAnimatedTransformList, SVGAnimationTransformListFunction> {
+    using Base = SVGAnimatedPropertyAnimator<SVGAnimatedTransformList, SVGAnimationTransformListFunction>;
+    using Base::Base;
+
+public:
+    static auto create(const QualifiedName& attributeName, Ref<SVGAnimatedTransformList>& animated, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive)
+    {
+        return std::make_unique<SVGAnimatedTransformListAnimator>(attributeName, animated, animationMode, calcMode, isAccumulated, isAdditive);
+    }
+
+private:
+    void progress(SVGElement* targetElement, float percentage, unsigned repeatCount) final
+    {
+        m_function.progress(targetElement, percentage, repeatCount, m_animated->animVal());
+    }
+};
+
 }

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

@@ -30 +30 @@
 #include "SVGAnimatedPrimitiveProperty.h"
 #include "SVGAnimatedPropertyList.h"
-#include "SVGAnimatedTransformList.h"
 #include "SVGAnimatedValueProperty.h"
 #include "SVGDecoratedEnumeration.h"
@@ -41 +40 @@
 #include "SVGPreserveAspectRatio.h"
 #include "SVGRect.h"
+#include "SVGTransformList.h"
 
 namespace WebCore {
@@ -59 +59 @@
 using SVGAnimatedNumberList = SVGAnimatedPropertyList<SVGNumberList>;
 using SVGAnimatedPointList = SVGAnimatedPropertyList<SVGPointList>;
+using SVGAnimatedTransformList = SVGAnimatedPropertyList<SVGTransformList>;
 
 class SVGAnimatedOrientType : public SVGAnimatedEnumeration {

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

@@ -28 +28 @@
 #include "SVGAnimationAdditiveListFunction.h"
 #include "SVGLengthList.h"
+#include "SVGNumberList.h"
 #include "SVGPointList.h"
+#include "SVGTransformDistance.h"
+#include "SVGTransformList.h"
 
 namespace WebCore {
@@ -200 +203 @@
 };
 
+class SVGAnimationTransformListFunction : public SVGAnimationAdditiveListFunction<SVGTransformList> {
+public:
+    using Base = SVGAnimationAdditiveListFunction<SVGTransformList>;
+    using Base::Base;
+
+    void setFromAndToValues(SVGElement*, const String& from, const String& to) override
+    {
+        m_from->parse(from);
+        m_to->parse(to);
+    }
+
+    void setToAtEndOfDurationValue(const String& toAtEndOfDuration) override
+    {
+        m_toAtEndOfDuration->parse(toAtEndOfDuration);
+    }
+
+    void progress(SVGElement*, float percentage, unsigned repeatCount, RefPtr<SVGTransformList>& animated)
+    {
+        // Pass false to 'resizeAnimatedIfNeeded', as the special post-multiplication behavior of <animateTransform> needs to be respected below.
+        if (!adjustAnimatedList(m_animationMode, percentage, animated, false))
+            return;
+
+        // Spec: To animations provide specific functionality to get a smooth change from the underlying
+        // value to the ‘to’ attribute value, which conflicts mathematically with the requirement for
+        // additive transform animations to be post-multiplied. As a consequence, in SVG 1.1 the behavior
+        // of to animations for ‘animateTransform’ is undefined.
+        const Vector<Ref<SVGTransform>>& fromItems = m_from->items();
+        const Vector<Ref<SVGTransform>>& toItems = m_to->items();
+        const Vector<Ref<SVGTransform>>& toAtEndOfDurationItems = toAtEndOfDuration()->items();
+        Vector<Ref<SVGTransform>>& animatedItems = animated->items();
+
+        // Never resize the animatedList to the m_to size, instead either clear the list
+        // or append to it.
+        if (!animatedItems.isEmpty() && (!m_isAdditive || m_animationMode == AnimationMode::To))
+            animatedItems.clear();
+
+        auto fromItemsSize = fromItems.size();
+
+        static const AffineTransform zerosAffineTransform = { 0, 0, 0, 0, 0, 0 };
+        const SVGTransformValue& to = toItems[0]->value();
+        const SVGTransformValue zerosTransform = SVGTransformValue(to.type(), zerosAffineTransform);
+
+        const SVGTransformValue& from = fromItemsSize ? fromItems[0]->value() : zerosTransform;
+        SVGTransformValue current = SVGTransformDistance(from, to).scaledDistance(percentage).addToSVGTransform(from);
+
+        if (m_isAccumulated && repeatCount) {
+            const SVGTransformValue& toAtEndOfDuration = toAtEndOfDurationItems.size() ? toAtEndOfDurationItems[0]->value() : zerosTransform;
+            animatedItems.append(SVGTransform::create(SVGTransformDistance::addSVGTransforms(current, toAtEndOfDuration, repeatCount)));
+        } else
+            animatedItems.append(SVGTransform::create(current));
+    }
+
+private:
+    void addFromAndToValues(SVGElement*) override
+    {
+        const Vector<Ref<SVGTransform>>& fromItems = m_from->items();
+        Vector<Ref<SVGTransform>>& toItems = m_to->items();
+
+        if (!fromItems.size() || fromItems.size() != toItems.size())
+            return;
+
+        ASSERT(fromItems.size() == 1);
+        const Ref<SVGTransform>& from = fromItems[0];
+        Ref<SVGTransform>& to = toItems[0];
+
+        to->setValue(SVGTransformDistance::addSVGTransforms(from->value(), to->value()));
+    }
+};
+
 }

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

@@ -26 +26 @@
 #pragma once
 
+#include "Color.h"
+#include "FloatRect.h"
+#include "SVGAngleValue.h"
 #include "SVGAnimationAdditiveValueFunction.h"
+#include "SVGLengthValue.h"
 #include "SVGPathByteStream.h"
 #include "SVGPropertyTraits.h"

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

@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedTransformList.h"
 #include "SVGAttributeAccessor.h"
 #include "SVGLegacyAnimatedProperty.h"
@@ -41 +40 @@
         static NeverDestroyed<SVGAttributeRegistry<OwnerType, BaseTypes...>> map;
         return map;
-    }
-
-    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGZoomAndPanTypeAttribute OwnerType::*attribute>
-    void registerAttribute()
-    {
-        registerAttribute(SVGZoomAndPanTypeAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
-    }
-
-    // Animatable attributes
-    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGAnimatedTransformListAttribute OwnerType::*attribute>
-    void registerAttribute()
-    {
-        registerAttribute(SVGAnimatedTransformListAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
     }
 

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

@@ -41 +41 @@
 };
 
+template<typename OwnerType>
+class SVGTransformListAccessor final : public SVGPropertyAccessor<OwnerType, SVGTransformList> {
+    using Base = SVGPropertyAccessor<OwnerType, SVGTransformList>;
+
+public:
+    using Base::Base;
+    template<Ref<SVGTransformList> OwnerType::*property>
+    constexpr static const SVGMemberAccessor<OwnerType>& singleton() { return Base::template singleton<SVGTransformListAccessor, property>(); }
+};
+
 }

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

@@ -50 +50 @@
     }
 
+    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGTransformList> OwnerType::*property>
+    static void registerProperty()
+    {
+        registerProperty(attributeName, SVGTransformListAccessor<OwnerType>::template singleton<property>());
+    }
+
     template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGAnimatedBoolean> OwnerType::*property>
     static void registerProperty()
@@ -127 +133 @@
         registerProperty(attributeName, SVGAnimatedStringAccessor<OwnerType>::template singleton<property>());
     }
-    
+
+    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGAnimatedTransformList> OwnerType::*property>
+    static void registerProperty()
+    {
+        registerProperty(attributeName, SVGAnimatedTransformListAccessor<OwnerType>::template singleton<property>());
+    }
+
     template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGAnimatedInteger> OwnerType::*property1, Ref<SVGAnimatedInteger> OwnerType::*property2>
     static void registerProperty()