Changeset 243036 in webkit

Timestamp:

Mar 16, 2019 12:42:41 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove the SVG property tear off objects for SVGAnimatedInteger
​https://bugs.webkit.org/show_bug.cgi?id=195722

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

Instead of saving a raw integer value in the SVGElement and then wrapping
the pointer to this raw data in a tear off object, we will represent the
integer as Ref<SVGAnimatedInteger> in SVGElement. This will make the
representation of the property in IDL file match the C++ header file.

When the DOM requests the SVGAnimatedInteger, we get return a reference
to the new animated property. When the rendering code asks for the current
value of the this animated property, we return the animVal() or the
baseVal() depending on whether the property is animating or not.

A pointer to a member in the SVGElement will be registered along with the
associated attribute name in SVGPropertyRegistry. Registering the property
creates an SVGMemberAccessor and links to the associated attribute. The
function of SVGMemberAccessor is to retrieve the value of the property
given a pointer to an SVGElement.

SVGPropertyRegistry manages all the properties of SVGElement. It takes
into account the inherited properties as well.

SVGElement will have a virtual method called propertyRegistry(). Every
superclass will override this method to return a reference to its registry
which includes all the registered properties of this class and its bases.

One important function of the SVGPropertyRegistry and SVGAccessor is they
create the appropriate SVGAttributeAnimator for this property.

SVGAttributeAnimator is just a connection between the animated property
and SVGAnimationFunction. SVGAnimationFunction calculates the values of
the animated property within a time interval. SVGAnimatedPropertyAnimator
updates animVal of the animated property and invalidates the associated
SVGElement and all the instances that references this element.

The plan is to remove all the SVG tear off objects like what this patch
does for SVGAnimatedInteger. So for a period of time the old code and the
new code will co-exist together. These things to consider when reviewing
this patch:

-- SVGAnimatedElementBase was re-factored to use SVGAttributeAnimationControllerBase
which is inherited by SVGLegacyAttributeAnimationController and
SVGAttributeAnimationController. The tear-off properties code which uses
SVGAnimatedType now lives in SVGLegacyAttributeAnimationController. The
new code was added to SVGAttributeAnimationController. The plan is to
remove the three animation controllers and to move the code of
SVGAttributeAnimationController to SVGAnimatedElementBase when all the tear
off code is removed.

-- SVGElement now keeps two registries one for the tear-off world and the
other for the new world. Eventually we need to get rid of tear-off registry.

-- SVGElement will differentiate between the type of the property by the
the method isAnimatedAttribute().

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

• svg/SVGAnimateElementBase.cpp:

(WebCore::SVGAnimateElementBase::SVGAnimateElementBase):
(WebCore::SVGAnimateElementBase::attributeAnimationController):
(WebCore::SVGAnimateElementBase::attributeAnimationControllerIfExists):
(WebCore::SVGAnimateElementBase::hasValidAttributeType const):
(WebCore::SVGAnimateElementBase::determineAnimatedPropertyType const):
(WebCore::SVGAnimateElementBase::calculateAnimatedValue):
(WebCore::SVGAnimateElementBase::calculateToAtEndOfDurationValue):
(WebCore::SVGAnimateElementBase::calculateFromAndToValues):
(WebCore::SVGAnimateElementBase::calculateFromAndByValues):
(WebCore::SVGAnimateElementBase::resetAnimatedType):
(WebCore::SVGAnimateElementBase::clearAnimatedType):
(WebCore::SVGAnimateElementBase::applyResultsToTarget):
(WebCore::SVGAnimateElementBase::isAdditive const):
(WebCore::SVGAnimateElementBase::calculateDistance):
(WebCore::SVGAnimateElementBase::setTargetElement):
(WebCore::SVGAnimateElementBase::setAttributeName):
(WebCore::SVGAnimateElementBase::resetAnimation):
(WebCore::SVGAnimateElementBase::hasInvalidCSSAttributeType const):
(WebCore::SVGAnimateElementBase::hasValidAttributeType): Deleted.
(WebCore::propertyTypesAreConsistent): Deleted.
(WebCore::applyCSSPropertyToTarget): Deleted.
(WebCore::removeCSSPropertyFromTarget): Deleted.
(WebCore::applyCSSPropertyToTargetAndInstances): Deleted.
(WebCore::removeCSSPropertyFromTargetAndInstances): Deleted.
(WebCore::notifyTargetAboutAnimValChange): Deleted.
(WebCore::notifyTargetAndInstancesAboutAnimValChange): Deleted.
(WebCore::SVGAnimateElementBase::animatedPropertyTypeSupportsAddition const): Deleted.
(WebCore::SVGAnimateElementBase::resetAnimatedPropertyType): Deleted.
(WebCore::SVGAnimateElementBase::ensureAnimator): Deleted.

• svg/SVGAnimateElementBase.h:
• svg/SVGAnimateMotionElement.cpp:

(WebCore::SVGAnimateMotionElement::hasValidAttributeType const):
(WebCore::SVGAnimateMotionElement::hasValidAttributeName const):
(WebCore::SVGAnimateMotionElement::hasValidAttributeType): Deleted.
(WebCore::SVGAnimateMotionElement::hasValidAttributeName): Deleted.

• svg/SVGAnimateMotionElement.h:
• svg/SVGAnimateTransformElement.cpp:

(WebCore::SVGAnimateTransformElement::hasValidAttributeType const):
(WebCore::SVGAnimateTransformElement::hasValidAttributeType): Deleted.

• svg/SVGAnimateTransformElement.h:
• svg/SVGAnimatedInteger.cpp: Removed.
• svg/SVGAnimatedInteger.h: Removed.
• svg/SVGAnimatedIntegerOptionalInteger.cpp: Removed.
• svg/SVGAnimatedIntegerOptionalInteger.h: Removed.
• svg/SVGAnimatedPointList.h:
• svg/SVGAnimationElement.cpp:

(WebCore::SVGAnimationElement::setAttributeType):
(WebCore::SVGAnimationElement::resetAnimation):
(WebCore::SVGAnimationElement::resetAnimatedPropertyType): Deleted.
(WebCore::SVGAnimationElement::setTargetElement): Deleted.
(WebCore::SVGAnimationElement::checkInvalidCSSAttributeType): Deleted.

• svg/SVGAnimationElement.h:

(WebCore::SVGAnimationElement::attributeType const):
(WebCore::SVGAnimationElement::hasInvalidCSSAttributeType const): Deleted.

• svg/SVGAnimatorFactory.h:

(WebCore::SVGAnimatorFactory::create):

• svg/SVGAttributeAnimationController.cpp: Added.

(WebCore::SVGAttributeAnimationController::SVGAttributeAnimationController):
(WebCore::SVGAttributeAnimationController::animator const):
(WebCore::SVGAttributeAnimationController::isDiscreteAnimator const):
(WebCore::SVGAttributeAnimationController::isAdditive const):
(WebCore::SVGAttributeAnimationController::hasValidAttributeType const):
(WebCore::SVGAttributeAnimationController::calculateFromAndToValues):
(WebCore::SVGAttributeAnimationController::calculateFromAndByValues):
(WebCore::SVGAttributeAnimationController::calculateToAtEndOfDurationValue):
(WebCore::SVGAttributeAnimationController::resetAnimatedType):
(WebCore::SVGAttributeAnimationController::calculateAnimatedValue):
(WebCore::SVGAttributeAnimationController::applyResultsToTarget):
(WebCore::SVGAttributeAnimationController::clearAnimatedType):
(WebCore::SVGAttributeAnimationController::calculateDistance):

• svg/SVGAttributeAnimationController.h: Added.

(WebCore::SVGAttributeAnimationController::animatorIfExists const):

• svg/SVGAttributeAnimationControllerBase.cpp: Added.

(WebCore::SVGAttributeAnimationControllerBase::SVGAttributeAnimationControllerBase):
(WebCore::SVGAttributeAnimationControllerBase::determineAnimatedPropertyType):

• svg/SVGAttributeAnimationControllerBase.h: Added.
• svg/SVGElement.cpp:

(WebCore::SVGElement::synchronizeAllAnimatedSVGAttribute):
(WebCore::SVGElement::synchronizeAnimatedSVGAttribute const):
(WebCore::SVGElement::commitPropertyChange):
(WebCore::SVGElement::isAnimatedPropertyAttribute const):
(WebCore::SVGElement::isAnimatedAttribute const):
(WebCore::SVGElement::createAnimator):

• svg/SVGElement.h:

(WebCore::SVGElement::propertyRegistry const):

• svg/SVGFEConvolveMatrixElement.cpp:

(WebCore::SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement):
(WebCore::SVGFEConvolveMatrixElement::registerAttributes):
(WebCore::SVGFEConvolveMatrixElement::parseAttribute):
(WebCore::SVGFEConvolveMatrixElement::setOrder):
(WebCore::SVGFEConvolveMatrixElement::orderXIdentifier): Deleted.
(WebCore::SVGFEConvolveMatrixElement::orderYIdentifier): Deleted.

• svg/SVGFEConvolveMatrixElement.h:
• svg/SVGFETurbulenceElement.cpp:

(WebCore::SVGFETurbulenceElement::SVGFETurbulenceElement):
(WebCore::SVGFETurbulenceElement::registerAttributes):
(WebCore::SVGFETurbulenceElement::parseAttribute):
(WebCore::SVGFETurbulenceElement::svgAttributeChanged):

• svg/SVGFETurbulenceElement.h:
• svg/SVGFilterElement.h:
• svg/SVGLegacyAttributeAnimationController.cpp: Added.

(WebCore::SVGLegacyAttributeAnimationController::SVGLegacyAttributeAnimationController):
(WebCore::SVGLegacyAttributeAnimationController::animatedTypeAnimator):
(WebCore::SVGLegacyAttributeAnimationController::isAdditive const):
(WebCore::SVGLegacyAttributeAnimationController::hasValidAttributeType const):
(WebCore::SVGLegacyAttributeAnimationController::calculateFromAndToValues):
(WebCore::SVGLegacyAttributeAnimationController::calculateFromAndByValues):
(WebCore::SVGLegacyAttributeAnimationController::calculateToAtEndOfDurationValue):
(WebCore::propertyTypesAreConsistent):
(WebCore::SVGLegacyAttributeAnimationController::resetAnimatedType):
(WebCore::SVGLegacyAttributeAnimationController::calculateAnimatedValue):
(WebCore::applyCSSPropertyToTarget):
(WebCore::removeCSSPropertyFromTarget):
(WebCore::applyCSSPropertyToTargetAndInstances):
(WebCore::removeCSSPropertyFromTargetAndInstances):
(WebCore::notifyTargetAboutAnimValChange):
(WebCore::notifyTargetAndInstancesAboutAnimValChange):
(WebCore::SVGLegacyAttributeAnimationController::applyResultsToTarget):
(WebCore::SVGLegacyAttributeAnimationController::clearAnimatedType):
(WebCore::SVGLegacyAttributeAnimationController::calculateDistance):

• svg/SVGLegacyAttributeAnimationController.h: Added.
• svg/animation/SVGSMILElement.cpp:

(WebCore::SVGSMILElement::hasValidAttributeName const):
(WebCore::SVGSMILElement::hasValidAttributeName): Deleted.

• svg/animation/SVGSMILElement.h:
• svg/properties/SVGAnimatedPrimitiveProperty.h: Added.

(WebCore::SVGAnimatedPrimitiveProperty::create):
(WebCore::SVGAnimatedPrimitiveProperty::setBaseVal):
(WebCore::SVGAnimatedPrimitiveProperty::setBaseValInternal):
(WebCore::SVGAnimatedPrimitiveProperty::baseVal const):
(WebCore::SVGAnimatedPrimitiveProperty::setAnimVal):
(WebCore::SVGAnimatedPrimitiveProperty::animVal const):
(WebCore::SVGAnimatedPrimitiveProperty::animVal):
(WebCore::SVGAnimatedPrimitiveProperty::currentValue const):
(WebCore::SVGAnimatedPrimitiveProperty::SVGAnimatedPrimitiveProperty):

• svg/properties/SVGAnimatedProperty.cpp: Added.

(WebCore::SVGAnimatedProperty::owner const):
(WebCore::SVGAnimatedProperty::commitPropertyChange):

• svg/properties/SVGAnimatedProperty.h: Added.

(WebCore::SVGAnimatedProperty::isAttached const):
(WebCore::SVGAnimatedProperty::detach):
(WebCore::SVGAnimatedProperty::contextElement const):
(WebCore::SVGAnimatedProperty::baseValAsString const):
(WebCore::SVGAnimatedProperty::animValAsString const):
(WebCore::SVGAnimatedProperty::isDirty const):
(WebCore::SVGAnimatedProperty::setDirty):
(WebCore::SVGAnimatedProperty::synchronize):
(WebCore::SVGAnimatedProperty::isAnimating const):
(WebCore::SVGAnimatedProperty::startAnimation):
(WebCore::SVGAnimatedProperty::stopAnimation):
(WebCore::SVGAnimatedProperty::instanceStartAnimation):
(WebCore::SVGAnimatedProperty::instanceStopAnimation):
(WebCore::SVGAnimatedProperty::SVGAnimatedProperty):

• svg/properties/SVGAnimatedPropertyAccessor.h: Added.
• svg/properties/SVGAnimatedPropertyAccessorImpl.h: Added.
• svg/properties/SVGAnimatedPropertyAnimator.h: Added.

(WebCore::SVGAnimatedPropertyAnimator::appendAnimatedInstance):
(WebCore::SVGAnimatedPropertyAnimator::SVGAnimatedPropertyAnimator):

• svg/properties/SVGAnimatedPropertyAnimatorImpl.h: Added.
• svg/properties/SVGAnimatedPropertyImpl.h: Added.
• svg/properties/SVGAnimatedPropertyPairAccessor.h: Added.

(WebCore::SVGAnimatedPropertyPairAccessor::SVGAnimatedPropertyPairAccessor):
(WebCore::SVGAnimatedPropertyPairAccessor::singleton):
(WebCore::SVGAnimatedPropertyPairAccessor::property1 const):
(WebCore::SVGAnimatedPropertyPairAccessor::property2 const):

• svg/properties/SVGAnimatedPropertyPairAccessorImpl.h: Added.
• svg/properties/SVGAnimatedPropertyPairAnimator.h: Added.

(WebCore::SVGAnimatedPropertyPairAnimator::appendAnimatedInstance):
(WebCore::SVGAnimatedPropertyPairAnimator::SVGAnimatedPropertyPairAnimator):

• svg/properties/SVGAnimatedPropertyPairAnimatorImpl.h: Added.
• svg/properties/SVGAnimationAdditiveFunction.h: Added.

(WebCore::SVGAnimationAdditiveFunction::SVGAnimationAdditiveFunction):
(WebCore::SVGAnimationAdditiveFunction::progress):

• svg/properties/SVGAnimationAdditiveValueFunction.h: Added.

(WebCore::SVGAnimationAdditiveValueFunction::toAtEndOfDuration const):

• svg/properties/SVGAnimationAdditiveValueFunctionImpl.h: Added.

(WebCore::SVGAnimationIntegerFunction::progress):

• svg/properties/SVGAnimationFunction.h: Added.

(WebCore::SVGAnimationFunction::isDiscrete const):
(WebCore::SVGAnimationFunction::calculateDistance const):
(WebCore::SVGAnimationFunction::SVGAnimationFunction):
(WebCore::SVGAnimationFunction::addFromAndToValues):

• svg/properties/SVGAttributeAnimator.cpp: Added.

(WebCore::SVGAttributeAnimator::applyAnimatedPropertyChange):

• svg/properties/SVGAttributeAnimator.h: Added.

(WebCore::SVGAttributeAnimator::SVGAttributeAnimator):
(WebCore::SVGAttributeAnimator::isDiscrete const):
(WebCore::SVGAttributeAnimator::setFromAndToValues):
(WebCore::SVGAttributeAnimator::setFromAndByValues):
(WebCore::SVGAttributeAnimator::setToAtEndOfDurationValue):
(WebCore::SVGAttributeAnimator::calculateDistance const):

• svg/properties/SVGAttributeOwnerProxy.cpp:
• svg/properties/SVGAttributeOwnerProxy.h:
• svg/properties/SVGAttributeRegistry.h:
• svg/properties/SVGMemberAccessor.h: Added.

(WebCore::SVGMemberAccessor::detach const):
(WebCore::SVGMemberAccessor::isAnimatedProperty const):
(WebCore::SVGMemberAccessor::isAnimatedLength const):
(WebCore::SVGMemberAccessor::matches const):
(WebCore::SVGMemberAccessor::synchronize const):
(WebCore::SVGMemberAccessor::createAnimator const):
(WebCore::SVGMemberAccessor::appendAnimatedInstance const):

• svg/properties/SVGPointerMemberAccessor.h: Added.

(WebCore::SVGPointerMemberAccessor::SVGPointerMemberAccessor):
(WebCore::SVGPointerMemberAccessor::property const):
(WebCore::SVGPointerMemberAccessor::singleton):

• svg/properties/SVGProperty.h: Added.
• svg/properties/SVGPropertyOwner.h: Added.

(WebCore::SVGPropertyOwner::owner const):
(WebCore::SVGPropertyOwner::attributeContextElement const):
(WebCore::SVGPropertyOwner::commitPropertyChange):

• svg/properties/SVGPropertyOwnerRegistry.h: Added.

(WebCore::SVGPropertyOwnerRegistry::SVGPropertyOwnerRegistry):
(WebCore::SVGPropertyOwnerRegistry::registerProperty):
(WebCore::SVGPropertyOwnerRegistry::enumerateRecursively):
(WebCore::SVGPropertyOwnerRegistry::isKnownAttribute):
(WebCore::SVGPropertyOwnerRegistry::enumerateRecursivelyBaseTypes):
(WebCore::SVGPropertyOwnerRegistry::findAccessor):

• svg/properties/SVGPropertyRegistry.h: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (4 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (14 diffs)
• bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• svg/SVGAnimateElementBase.cpp (modified) (9 diffs)
• svg/SVGAnimateElementBase.h (modified) (3 diffs)
• svg/SVGAnimateMotionElement.cpp (modified) (2 diffs)
• svg/SVGAnimateMotionElement.h (modified) (1 diff)
• svg/SVGAnimateTransformElement.cpp (modified) (2 diffs)
• svg/SVGAnimateTransformElement.h (modified) (1 diff)
• svg/SVGAnimatedInteger.cpp (deleted)
• svg/SVGAnimatedInteger.h (deleted)
• svg/SVGAnimatedIntegerOptionalInteger.cpp (deleted)
• svg/SVGAnimatedIntegerOptionalInteger.h (deleted)
• svg/SVGAnimatedPointList.h (modified) (1 diff)
• svg/SVGAnimationElement.cpp (modified) (3 diffs)
• svg/SVGAnimationElement.h (modified) (6 diffs)
• svg/SVGAnimatorFactory.h (modified) (2 diffs)
• svg/SVGAttributeAnimationController.cpp (added)
• svg/SVGAttributeAnimationController.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/SVGAttributeAnimationControllerBase.cpp (added)
• svg/SVGAttributeAnimationControllerBase.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/SVGElement.cpp (modified) (2 diffs)
• svg/SVGElement.h (modified) (5 diffs)
• svg/SVGFEConvolveMatrixElement.cpp (modified) (7 diffs)
• svg/SVGFEConvolveMatrixElement.h (modified) (5 diffs)
• svg/SVGFETurbulenceElement.cpp (modified) (4 diffs)
• svg/SVGFETurbulenceElement.h (modified) (6 diffs)
• svg/SVGFilterElement.h (modified) (1 diff)
• svg/SVGLegacyAttributeAnimationController.cpp (copied) (copied from trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp) (3 diffs)
• svg/SVGLegacyAttributeAnimationController.h (added)
• svg/animation/SVGSMILElement.cpp (modified) (1 diff)
• svg/animation/SVGSMILElement.h (modified) (1 diff)
• svg/properties/SVGAnimatedPrimitiveProperty.h (added)
• svg/properties/SVGAnimatedProperty.cpp (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAnimatedProperty.h (added)
• svg/properties/SVGAnimatedPropertyAccessor.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAnimatedPropertyAccessorImpl.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGAnimatedPropertyAnimator.h (added)
• svg/properties/SVGAnimatedPropertyAnimatorImpl.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGAnimatedPropertyImpl.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAnimatedPropertyPairAccessor.h (added)
• svg/properties/SVGAnimatedPropertyPairAccessorImpl.h (added)
• svg/properties/SVGAnimatedPropertyPairAnimator.h (added)
• svg/properties/SVGAnimatedPropertyPairAnimatorImpl.h (added)
• svg/properties/SVGAnimationAdditiveFunction.h (added)
• svg/properties/SVGAnimationAdditiveValueFunction.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAnimationAdditiveValueFunctionImpl.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGAnimationFunction.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAttributeAnimator.cpp (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGAttributeAnimator.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGAttributeOwnerProxy.cpp (modified) (1 diff)
• svg/properties/SVGAttributeOwnerProxy.h (modified) (1 diff)
• svg/properties/SVGAttributeRegistry.h (modified) (2 diffs)
• svg/properties/SVGMemberAccessor.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGPointerMemberAccessor.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h) (2 diffs)
• svg/properties/SVGProperty.h (added)
• svg/properties/SVGPropertyOwner.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)
• svg/properties/SVGPropertyOwnerRegistry.h (added)
• svg/properties/SVGPropertyRegistry.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-16  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Remove the SVG property tear off objects for SVGAnimatedInteger
+        https://bugs.webkit.org/show_bug.cgi?id=195722
+
+        Reviewed by Simon Fraser.
+
+        Instead of saving a raw integer value in the SVGElement and then wrapping
+        the pointer to this raw data in a tear off object, we will represent the
+        integer as Ref<SVGAnimatedInteger> in SVGElement. This will make the 
+        representation of the property in IDL file match the C++ header file.
+
+        When the DOM requests the SVGAnimatedInteger, we get return a reference
+        to the new animated property. When the rendering code asks for the current
+        value of the this animated property, we return the animVal() or the
+        baseVal() depending on whether the property is animating or not.
+
+        A pointer to a member in the SVGElement will be registered along with the
+        associated attribute name in SVGPropertyRegistry. Registering the property
+        creates an SVGMemberAccessor and links to the associated attribute. The
+        function of SVGMemberAccessor is to retrieve the value of the property
+        given a pointer to an SVGElement.
+
+        SVGPropertyRegistry manages all the properties of SVGElement. It takes
+        into account the inherited properties as well.
+
+        SVGElement will have a virtual method called propertyRegistry(). Every
+        superclass will override this method to return a reference to its registry
+        which includes all the registered properties of this class and its bases.
+
+        One important function of the SVGPropertyRegistry and SVGAccessor is they
+        create the appropriate SVGAttributeAnimator for this property.
+
+        SVGAttributeAnimator is just a connection between the animated property
+        and SVGAnimationFunction. SVGAnimationFunction calculates the values of
+        the animated property within a time interval. SVGAnimatedPropertyAnimator
+        updates animVal of the animated property and invalidates the associated
+        SVGElement and all the instances that references this element.
+
+        The plan is to remove all the SVG tear off objects like what this patch
+        does for SVGAnimatedInteger. So for a period of time the old code and the
+        new code will co-exist together. These things to consider when reviewing
+        this patch:
+
+        -- SVGAnimatedElementBase was re-factored to use SVGAttributeAnimationControllerBase
+        which is inherited by SVGLegacyAttributeAnimationController and
+        SVGAttributeAnimationController. The tear-off properties code which uses
+        SVGAnimatedType now lives in SVGLegacyAttributeAnimationController. The
+        new code was added to SVGAttributeAnimationController. The plan is to 
+        remove the three animation controllers and to move the code of
+        SVGAttributeAnimationController to SVGAnimatedElementBase when all the tear
+        off code is removed.
+
+        -- SVGElement now keeps two registries one for the tear-off world and the
+        other for the new world. Eventually we need to get rid of tear-off registry.
+
+        -- SVGElement will differentiate between the type of the property by the
+        the method isAnimatedAttribute().
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+        * svg/SVGAnimateElementBase.cpp:
+        (WebCore::SVGAnimateElementBase::SVGAnimateElementBase):
+        (WebCore::SVGAnimateElementBase::attributeAnimationController):
+        (WebCore::SVGAnimateElementBase::attributeAnimationControllerIfExists):
+        (WebCore::SVGAnimateElementBase::hasValidAttributeType const):
+        (WebCore::SVGAnimateElementBase::determineAnimatedPropertyType const):
+        (WebCore::SVGAnimateElementBase::calculateAnimatedValue):
+        (WebCore::SVGAnimateElementBase::calculateToAtEndOfDurationValue):
+        (WebCore::SVGAnimateElementBase::calculateFromAndToValues):
+        (WebCore::SVGAnimateElementBase::calculateFromAndByValues):
+        (WebCore::SVGAnimateElementBase::resetAnimatedType):
+        (WebCore::SVGAnimateElementBase::clearAnimatedType):
+        (WebCore::SVGAnimateElementBase::applyResultsToTarget):
+        (WebCore::SVGAnimateElementBase::isAdditive const):
+        (WebCore::SVGAnimateElementBase::calculateDistance):
+        (WebCore::SVGAnimateElementBase::setTargetElement):
+        (WebCore::SVGAnimateElementBase::setAttributeName):
+        (WebCore::SVGAnimateElementBase::resetAnimation):
+        (WebCore::SVGAnimateElementBase::hasInvalidCSSAttributeType const):
+        (WebCore::SVGAnimateElementBase::hasValidAttributeType): Deleted.
+        (WebCore::propertyTypesAreConsistent): Deleted.
+        (WebCore::applyCSSPropertyToTarget): Deleted.
+        (WebCore::removeCSSPropertyFromTarget): Deleted.
+        (WebCore::applyCSSPropertyToTargetAndInstances): Deleted.
+        (WebCore::removeCSSPropertyFromTargetAndInstances): Deleted.
+        (WebCore::notifyTargetAboutAnimValChange): Deleted.
+        (WebCore::notifyTargetAndInstancesAboutAnimValChange): Deleted.
+        (WebCore::SVGAnimateElementBase::animatedPropertyTypeSupportsAddition const): Deleted.
+        (WebCore::SVGAnimateElementBase::resetAnimatedPropertyType): Deleted.
+        (WebCore::SVGAnimateElementBase::ensureAnimator): Deleted.
+        * svg/SVGAnimateElementBase.h:
+        * svg/SVGAnimateMotionElement.cpp:
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeType const):
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeName const):
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeType): Deleted.
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeName): Deleted.
+        * svg/SVGAnimateMotionElement.h:
+        * svg/SVGAnimateTransformElement.cpp:
+        (WebCore::SVGAnimateTransformElement::hasValidAttributeType const):
+        (WebCore::SVGAnimateTransformElement::hasValidAttributeType): Deleted.
+        * svg/SVGAnimateTransformElement.h:
+        * svg/SVGAnimatedInteger.cpp: Removed.
+        * svg/SVGAnimatedInteger.h: Removed.
+        * svg/SVGAnimatedIntegerOptionalInteger.cpp: Removed.
+        * svg/SVGAnimatedIntegerOptionalInteger.h: Removed.
+        * svg/SVGAnimatedPointList.h:
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::setAttributeType):
+        (WebCore::SVGAnimationElement::resetAnimation):
+        (WebCore::SVGAnimationElement::resetAnimatedPropertyType): Deleted.
+        (WebCore::SVGAnimationElement::setTargetElement): Deleted.
+        (WebCore::SVGAnimationElement::checkInvalidCSSAttributeType): Deleted.
+        * svg/SVGAnimationElement.h:
+        (WebCore::SVGAnimationElement::attributeType const):
+        (WebCore::SVGAnimationElement::hasInvalidCSSAttributeType const): Deleted.
+        * svg/SVGAnimatorFactory.h:
+        (WebCore::SVGAnimatorFactory::create):
+        * svg/SVGAttributeAnimationController.cpp: Added.
+        (WebCore::SVGAttributeAnimationController::SVGAttributeAnimationController):
+        (WebCore::SVGAttributeAnimationController::animator const):
+        (WebCore::SVGAttributeAnimationController::isDiscreteAnimator const):
+        (WebCore::SVGAttributeAnimationController::isAdditive const):
+        (WebCore::SVGAttributeAnimationController::hasValidAttributeType const):
+        (WebCore::SVGAttributeAnimationController::calculateFromAndToValues):
+        (WebCore::SVGAttributeAnimationController::calculateFromAndByValues):
+        (WebCore::SVGAttributeAnimationController::calculateToAtEndOfDurationValue):
+        (WebCore::SVGAttributeAnimationController::resetAnimatedType):
+        (WebCore::SVGAttributeAnimationController::calculateAnimatedValue):
+        (WebCore::SVGAttributeAnimationController::applyResultsToTarget):
+        (WebCore::SVGAttributeAnimationController::clearAnimatedType):
+        (WebCore::SVGAttributeAnimationController::calculateDistance):
+        * svg/SVGAttributeAnimationController.h: Added.
+        (WebCore::SVGAttributeAnimationController::animatorIfExists const):
+        * svg/SVGAttributeAnimationControllerBase.cpp: Added.
+        (WebCore::SVGAttributeAnimationControllerBase::SVGAttributeAnimationControllerBase):
+        (WebCore::SVGAttributeAnimationControllerBase::determineAnimatedPropertyType):
+        * svg/SVGAttributeAnimationControllerBase.h: Added.
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::synchronizeAllAnimatedSVGAttribute):
+        (WebCore::SVGElement::synchronizeAnimatedSVGAttribute const):
+        (WebCore::SVGElement::commitPropertyChange):
+        (WebCore::SVGElement::isAnimatedPropertyAttribute const):
+        (WebCore::SVGElement::isAnimatedAttribute const):
+        (WebCore::SVGElement::createAnimator):
+        * svg/SVGElement.h:
+        (WebCore::SVGElement::propertyRegistry const):
+        * svg/SVGFEConvolveMatrixElement.cpp:
+        (WebCore::SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement):
+        (WebCore::SVGFEConvolveMatrixElement::registerAttributes):
+        (WebCore::SVGFEConvolveMatrixElement::parseAttribute):
+        (WebCore::SVGFEConvolveMatrixElement::setOrder):
+        (WebCore::SVGFEConvolveMatrixElement::orderXIdentifier): Deleted.
+        (WebCore::SVGFEConvolveMatrixElement::orderYIdentifier): Deleted.
+        * svg/SVGFEConvolveMatrixElement.h:
+        * svg/SVGFETurbulenceElement.cpp:
+        (WebCore::SVGFETurbulenceElement::SVGFETurbulenceElement):
+        (WebCore::SVGFETurbulenceElement::registerAttributes):
+        (WebCore::SVGFETurbulenceElement::parseAttribute):
+        (WebCore::SVGFETurbulenceElement::svgAttributeChanged):
+        * svg/SVGFETurbulenceElement.h:
+        * svg/SVGFilterElement.h:
+        * svg/SVGLegacyAttributeAnimationController.cpp: Added.
+        (WebCore::SVGLegacyAttributeAnimationController::SVGLegacyAttributeAnimationController):
+        (WebCore::SVGLegacyAttributeAnimationController::animatedTypeAnimator):
+        (WebCore::SVGLegacyAttributeAnimationController::isAdditive const):
+        (WebCore::SVGLegacyAttributeAnimationController::hasValidAttributeType const):
+        (WebCore::SVGLegacyAttributeAnimationController::calculateFromAndToValues):
+        (WebCore::SVGLegacyAttributeAnimationController::calculateFromAndByValues):
+        (WebCore::SVGLegacyAttributeAnimationController::calculateToAtEndOfDurationValue):
+        (WebCore::propertyTypesAreConsistent):
+        (WebCore::SVGLegacyAttributeAnimationController::resetAnimatedType):
+        (WebCore::SVGLegacyAttributeAnimationController::calculateAnimatedValue):
+        (WebCore::applyCSSPropertyToTarget):
+        (WebCore::removeCSSPropertyFromTarget):
+        (WebCore::applyCSSPropertyToTargetAndInstances):
+        (WebCore::removeCSSPropertyFromTargetAndInstances):
+        (WebCore::notifyTargetAboutAnimValChange):
+        (WebCore::notifyTargetAndInstancesAboutAnimValChange):
+        (WebCore::SVGLegacyAttributeAnimationController::applyResultsToTarget):
+        (WebCore::SVGLegacyAttributeAnimationController::clearAnimatedType):
+        (WebCore::SVGLegacyAttributeAnimationController::calculateDistance):
+        * svg/SVGLegacyAttributeAnimationController.h: Added.
+        * svg/animation/SVGSMILElement.cpp:
+        (WebCore::SVGSMILElement::hasValidAttributeName const):
+        (WebCore::SVGSMILElement::hasValidAttributeName): Deleted.
+        * svg/animation/SVGSMILElement.h:
+        * svg/properties/SVGAnimatedPrimitiveProperty.h: Added.
+        (WebCore::SVGAnimatedPrimitiveProperty::create):
+        (WebCore::SVGAnimatedPrimitiveProperty::setBaseVal):
+        (WebCore::SVGAnimatedPrimitiveProperty::setBaseValInternal):
+        (WebCore::SVGAnimatedPrimitiveProperty::baseVal const):
+        (WebCore::SVGAnimatedPrimitiveProperty::setAnimVal):
+        (WebCore::SVGAnimatedPrimitiveProperty::animVal const):
+        (WebCore::SVGAnimatedPrimitiveProperty::animVal):
+        (WebCore::SVGAnimatedPrimitiveProperty::currentValue const):
+        (WebCore::SVGAnimatedPrimitiveProperty::SVGAnimatedPrimitiveProperty):
+        * svg/properties/SVGAnimatedProperty.cpp: Added.
+        (WebCore::SVGAnimatedProperty::owner const):
+        (WebCore::SVGAnimatedProperty::commitPropertyChange):
+        * svg/properties/SVGAnimatedProperty.h: Added.
+        (WebCore::SVGAnimatedProperty::isAttached const):
+        (WebCore::SVGAnimatedProperty::detach):
+        (WebCore::SVGAnimatedProperty::contextElement const):
+        (WebCore::SVGAnimatedProperty::baseValAsString const):
+        (WebCore::SVGAnimatedProperty::animValAsString const):
+        (WebCore::SVGAnimatedProperty::isDirty const):
+        (WebCore::SVGAnimatedProperty::setDirty):
+        (WebCore::SVGAnimatedProperty::synchronize):
+        (WebCore::SVGAnimatedProperty::isAnimating const):
+        (WebCore::SVGAnimatedProperty::startAnimation):
+        (WebCore::SVGAnimatedProperty::stopAnimation):
+        (WebCore::SVGAnimatedProperty::instanceStartAnimation):
+        (WebCore::SVGAnimatedProperty::instanceStopAnimation):
+        (WebCore::SVGAnimatedProperty::SVGAnimatedProperty):
+        * svg/properties/SVGAnimatedPropertyAccessor.h: Added.
+        * svg/properties/SVGAnimatedPropertyAccessorImpl.h: Added.
+        * svg/properties/SVGAnimatedPropertyAnimator.h: Added.
+        (WebCore::SVGAnimatedPropertyAnimator::appendAnimatedInstance):
+        (WebCore::SVGAnimatedPropertyAnimator::SVGAnimatedPropertyAnimator):
+        * svg/properties/SVGAnimatedPropertyAnimatorImpl.h: Added.
+        * svg/properties/SVGAnimatedPropertyImpl.h: Added.
+        * svg/properties/SVGAnimatedPropertyPairAccessor.h: Added.
+        (WebCore::SVGAnimatedPropertyPairAccessor::SVGAnimatedPropertyPairAccessor):
+        (WebCore::SVGAnimatedPropertyPairAccessor::singleton):
+        (WebCore::SVGAnimatedPropertyPairAccessor::property1 const):
+        (WebCore::SVGAnimatedPropertyPairAccessor::property2 const):
+        * svg/properties/SVGAnimatedPropertyPairAccessorImpl.h: Added.
+        * svg/properties/SVGAnimatedPropertyPairAnimator.h: Added.
+        (WebCore::SVGAnimatedPropertyPairAnimator::appendAnimatedInstance):
+        (WebCore::SVGAnimatedPropertyPairAnimator::SVGAnimatedPropertyPairAnimator):
+        * svg/properties/SVGAnimatedPropertyPairAnimatorImpl.h: Added.
+        * svg/properties/SVGAnimationAdditiveFunction.h: Added.
+        (WebCore::SVGAnimationAdditiveFunction::SVGAnimationAdditiveFunction):
+        (WebCore::SVGAnimationAdditiveFunction::progress):
+        * svg/properties/SVGAnimationAdditiveValueFunction.h: Added.
+        (WebCore::SVGAnimationAdditiveValueFunction::toAtEndOfDuration const):
+        * svg/properties/SVGAnimationAdditiveValueFunctionImpl.h: Added.
+        (WebCore::SVGAnimationIntegerFunction::progress):
+        * svg/properties/SVGAnimationFunction.h: Added.
+        (WebCore::SVGAnimationFunction::isDiscrete const):
+        (WebCore::SVGAnimationFunction::calculateDistance const):
+        (WebCore::SVGAnimationFunction::SVGAnimationFunction):
+        (WebCore::SVGAnimationFunction::addFromAndToValues):
+        * svg/properties/SVGAttributeAnimator.cpp: Added.
+        (WebCore::SVGAttributeAnimator::applyAnimatedPropertyChange):
+        * svg/properties/SVGAttributeAnimator.h: Added.
+        (WebCore::SVGAttributeAnimator::SVGAttributeAnimator):
+        (WebCore::SVGAttributeAnimator::isDiscrete const):
+        (WebCore::SVGAttributeAnimator::setFromAndToValues):
+        (WebCore::SVGAttributeAnimator::setFromAndByValues):
+        (WebCore::SVGAttributeAnimator::setToAtEndOfDurationValue):
+        (WebCore::SVGAttributeAnimator::calculateDistance const):
+        * svg/properties/SVGAttributeOwnerProxy.cpp:
+        * svg/properties/SVGAttributeOwnerProxy.h:
+        * svg/properties/SVGAttributeRegistry.h:
+        * svg/properties/SVGMemberAccessor.h: Added.
+        (WebCore::SVGMemberAccessor::detach const):
+        (WebCore::SVGMemberAccessor::isAnimatedProperty const):
+        (WebCore::SVGMemberAccessor::isAnimatedLength const):
+        (WebCore::SVGMemberAccessor::matches const):
+        (WebCore::SVGMemberAccessor::synchronize const):
+        (WebCore::SVGMemberAccessor::createAnimator const):
+        (WebCore::SVGMemberAccessor::appendAnimatedInstance const):
+        * svg/properties/SVGPointerMemberAccessor.h: Added.
+        (WebCore::SVGPointerMemberAccessor::SVGPointerMemberAccessor):
+        (WebCore::SVGPointerMemberAccessor::property const):
+        (WebCore::SVGPointerMemberAccessor::singleton):
+        * svg/properties/SVGProperty.h: Added.
+        * svg/properties/SVGPropertyOwner.h: Added.
+        (WebCore::SVGPropertyOwner::owner const):
+        (WebCore::SVGPropertyOwner::attributeContextElement const):
+        (WebCore::SVGPropertyOwner::commitPropertyChange):
+        * svg/properties/SVGPropertyOwnerRegistry.h: Added.
+        (WebCore::SVGPropertyOwnerRegistry::SVGPropertyOwnerRegistry):
+        (WebCore::SVGPropertyOwnerRegistry::registerProperty):
+        (WebCore::SVGPropertyOwnerRegistry::enumerateRecursively):
+        (WebCore::SVGPropertyOwnerRegistry::isKnownAttribute):
+        (WebCore::SVGPropertyOwnerRegistry::enumerateRecursivelyBaseTypes):
+        (WebCore::SVGPropertyOwnerRegistry::findAccessor):
+        * svg/properties/SVGPropertyRegistry.h: Added.
+
 2019-03-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/Sources.txt

@@ -2274 +2274 @@
 svg/SVGAnimatedColor.cpp
 svg/SVGAnimatedEnumeration.cpp
-svg/SVGAnimatedInteger.cpp
-svg/SVGAnimatedIntegerOptionalInteger.cpp
 svg/SVGAnimatedLength.cpp
 svg/SVGAnimatedLengthList.cpp
@@ -2289 +2287 @@
 svg/SVGAnimatedTypeAnimator.cpp
 svg/SVGAnimationElement.cpp
+svg/SVGAttributeAnimationController.cpp
+svg/SVGAttributeAnimationControllerBase.cpp
 svg/SVGCircleElement.cpp
 svg/SVGClipPathElement.cpp
@@ -2346 +2346 @@
 svg/SVGImageLoader.cpp
 svg/SVGLangSpace.cpp
+svg/SVGLegacyAttributeAnimationController.cpp
 svg/SVGLengthContext.cpp
 svg/SVGLengthListValues.cpp
@@ -2425 +2426 @@
 
 svg/properties/SVGAnimatedPathSegListPropertyTearOff.cpp
+svg/properties/SVGAnimatedProperty.cpp
+svg/properties/SVGAttributeAnimator.cpp
 svg/properties/SVGAttributeOwnerProxy.cpp
 svg/properties/SVGLegacyAnimatedProperty.cpp

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

@@ -243 +243 @@
                 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 081AA8D91111237E002AB06E /* SVGElementRareData.h */; };
                 081EBF3B0FD34F4100DA7559 /* SVGFilterBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */; };
-                0823D159127AD6AC000EBC95 /* SVGAnimatedInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0823D158127AD6AC000EBC95 /* SVGAnimatedInteger.h */; };
                 08250939128BD4D800E2ED8E /* SVGAnimatedTransformList.h in Headers */ = {isa = PBXBuildFile; fileRef = 08250938128BD4D800E2ED8E /* SVGAnimatedTransformList.h */; };
                 082DE42D1292621600D923DF /* SVGPathSegWithContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 082DE42C1292621600D923DF /* SVGPathSegWithContext.h */; };
@@ -2137 +2136 @@
                 71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E2183817359FB8006E6E4D /* PlugInsResources.h */; };
                 71E2C42621C935280024F8C8 /* AnimationEffectPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E2C42421C9351D0024F8C8 /* AnimationEffectPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; };
                 71EADCD822087E720065A45F /* PointerID.h in Headers */ = {isa = PBXBuildFile; fileRef = 71EADCD622087E6D0065A45F /* PointerID.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 71EFCEDC202B38A900D7C411 /* AnimationEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 71EFCED7202B388D00D7C411 /* AnimationEffect.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5606 +5604 @@
                 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>"; };
-                0823D158127AD6AC000EBC95 /* SVGAnimatedInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedInteger.h; sourceTree = "<group>"; };
                 08250938128BD4D800E2ED8E /* SVGAnimatedTransformList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedTransformList.h; sourceTree = "<group>"; };
                 082DE42C1292621600D923DF /* SVGPathSegWithContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegWithContext.h; sourceTree = "<group>"; };
@@ -7693 +7690 @@
                 43EDD67C1B485DBF00640E75 /* CombinedFiltersAlphabet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CombinedFiltersAlphabet.cpp; sourceTree = "<group>"; };
                 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CombinedFiltersAlphabet.h; sourceTree = "<group>"; };
-                43F6FD9513BCD0B100224052 /* SVGAnimatedInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedInteger.cpp; sourceTree = "<group>"; };
                 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; };
                 4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
@@ -8673 +8669 @@
                 55AF14E31EAAC59B0026EEAA /* UTIRegistry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UTIRegistry.cpp; sourceTree = "<group>"; };
                 55AF14E41EAAC59B0026EEAA /* UTIRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UTIRegistry.h; sourceTree = "<group>"; };
+                55BE0257223B29C00032F08A /* SVGPropertyRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGPropertyRegistry.h; sourceTree = "<group>"; };
+                55BE0259223B29C10032F08A /* SVGAnimationAdditiveValueFunctionImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimationAdditiveValueFunctionImpl.h; sourceTree = "<group>"; };
+                55BE025A223B29C20032F08A /* SVGPointerMemberAccessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGPointerMemberAccessor.h; sourceTree = "<group>"; };
+                55BE025B223B29C20032F08A /* SVGAnimationFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimationFunction.h; sourceTree = "<group>"; };
+                55BE025C223B29C30032F08A /* SVGPropertyOwnerRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGPropertyOwnerRegistry.h; sourceTree = "<group>"; };
+                55BE025D223B29C40032F08A /* SVGAnimatedProperty.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedProperty.cpp; sourceTree = "<group>"; };
+                55BE025E223B29C40032F08A /* SVGAnimatedPropertyPairAccessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyPairAccessor.h; sourceTree = "<group>"; };
+                55BE025F223B29C50032F08A /* SVGAnimationAdditiveFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimationAdditiveFunction.h; sourceTree = "<group>"; };
                 55D408F71A7C631800C78450 /* SVGImageClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGImageClients.h; sourceTree = "<group>"; };
                 55D70D20223B009100044B8E /* SVGLegacyAnimatedProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLegacyAnimatedProperty.h; sourceTree = "<group>"; };
@@ -8678 +8682 @@
                 55D70D22223B00EA00044B8E /* SVGLegacyProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLegacyProperty.h; sourceTree = "<group>"; };
                 55EC95972069C92D007DD0A9 /* PaintFrequencyTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaintFrequencyTracker.h; sourceTree = "<group>"; };
+                55EE5354223B29E900FBA944 /* SVGMemberAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMemberAccessor.h; sourceTree = "<group>"; };
+                55EE5356223B29F700FBA944 /* SVGAnimatedPropertyAnimatorImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyAnimatorImpl.h; sourceTree = "<group>"; };
+                55EE5357223B29F800FBA944 /* SVGAnimatedPrimitiveProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPrimitiveProperty.h; sourceTree = "<group>"; };
+                55EE5358223B29F900FBA944 /* SVGAnimatedPropertyAccessorImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyAccessorImpl.h; sourceTree = "<group>"; };
+                55EE5359223B29FA00FBA944 /* SVGAnimatedPropertyAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyAccessor.h; sourceTree = "<group>"; };
+                55EE535A223B29FB00FBA944 /* SVGAnimatedPropertyAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyAnimator.h; sourceTree = "<group>"; };
+                55EE535B223B2A0C00FBA944 /* SVGAnimatedPropertyPairAnimatorImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyPairAnimatorImpl.h; sourceTree = "<group>"; };
+                55EE535C223B2A0D00FBA944 /* SVGAnimatedPropertyImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyImpl.h; sourceTree = "<group>"; };
+                55EE535D223B2A0D00FBA944 /* SVGAnimatedPropertyPairAccessorImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyPairAccessorImpl.h; sourceTree = "<group>"; };
+                55EE535E223B2A0E00FBA944 /* SVGAnimationAdditiveValueFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimationAdditiveValueFunction.h; sourceTree = "<group>"; };
+                55EE535F223B2A0F00FBA944 /* SVGAnimatedPropertyPairAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyPairAnimator.h; sourceTree = "<group>"; };
+                55EE5360223B2A2100FBA944 /* SVGPropertyOwner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPropertyOwner.h; sourceTree = "<group>"; };
+                55EE5361223B2A2200FBA944 /* SVGAttributeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAttributeAnimator.cpp; sourceTree = "<group>"; };
+                55EE5362223B2A2300FBA944 /* SVGAnimatedProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedProperty.h; sourceTree = "<group>"; };
+                55EE5363223B2A2400FBA944 /* SVGProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGProperty.h; sourceTree = "<group>"; };
+                55EE5364223B2A2400FBA944 /* SVGAttributeAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAttributeAnimator.h; sourceTree = "<group>"; };
                 55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttribute.h; sourceTree = "<group>"; };
                 55FA7FF4210FB688005AEFE7 /* SVGAttributeAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAttributeAccessor.h; sourceTree = "<group>"; };
@@ -9480 +9500 @@
                 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = PlugInsResourcesData.cpp; path = DerivedSources/WebCore/PlugInsResourcesData.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                 71E2C42421C9351D0024F8C8 /* AnimationEffectPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationEffectPhase.h; sourceTree = "<group>"; };
-                71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedIntegerOptionalInteger.cpp; sourceTree = "<group>"; };
-                71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; };
                 71EADCD622087E6D0065A45F /* PointerID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PointerID.h; sourceTree = "<group>"; };
                 71EFCED6202B388C00D7C411 /* AnimationEffect.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AnimationEffect.idl; sourceTree = "<group>"; };
@@ -9489 +9507 @@
                 71F936F71DD4F99B00922CC7 /* tracks-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "tracks-support.js"; sourceTree = "<group>"; };
                 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedEnumerationPropertyTearOff.h; sourceTree = "<group>"; };
+                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>"; };
                 724ED3291A3A7E5400F5F13C /* EXTBlendMinMax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EXTBlendMinMax.cpp; sourceTree = "<group>"; };
                 724ED32A1A3A7E5400F5F13C /* EXTBlendMinMax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXTBlendMinMax.h; sourceTree = "<group>"; };
@@ -16187 +16211 @@
                                 55FA7FFC2110F813005AEFE7 /* SVGAnimatedPathSegListPropertyTearOff.cpp */,
                                 089A8E06128D8B3D00E7A534 /* SVGAnimatedPathSegListPropertyTearOff.h */,
+                                55EE5357223B29F800FBA944 /* SVGAnimatedPrimitiveProperty.h */,
+                                55BE025D223B29C40032F08A /* SVGAnimatedProperty.cpp */,
+                                55EE5362223B2A2300FBA944 /* SVGAnimatedProperty.h */,
+                                55EE5359223B29FA00FBA944 /* SVGAnimatedPropertyAccessor.h */,
+                                55EE5358223B29F900FBA944 /* SVGAnimatedPropertyAccessorImpl.h */,
+                                55EE535A223B29FB00FBA944 /* SVGAnimatedPropertyAnimator.h */,
+                                55EE5356223B29F700FBA944 /* SVGAnimatedPropertyAnimatorImpl.h */,
                                 088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */,
+                                55EE535C223B2A0D00FBA944 /* SVGAnimatedPropertyImpl.h */,
+                                55BE025E223B29C40032F08A /* SVGAnimatedPropertyPairAccessor.h */,
+                                55EE535D223B2A0D00FBA944 /* SVGAnimatedPropertyPairAccessorImpl.h */,
+                                55EE535F223B2A0F00FBA944 /* SVGAnimatedPropertyPairAnimator.h */,
+                                55EE535B223B2A0C00FBA944 /* SVGAnimatedPropertyPairAnimatorImpl.h */,
                                 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */,
                                 55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */,
                                 08525E621278C00100A84778 /* SVGAnimatedStaticPropertyTearOff.h */,
                                 085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */,
+                                55BE025F223B29C50032F08A /* SVGAnimationAdditiveFunction.h */,
+                                55EE535E223B2A0E00FBA944 /* SVGAnimationAdditiveValueFunction.h */,
+                                55BE0259223B29C10032F08A /* SVGAnimationAdditiveValueFunctionImpl.h */,
+                                55BE025B223B29C20032F08A /* SVGAnimationFunction.h */,
                                 55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */,
                                 55FA7FF4210FB688005AEFE7 /* SVGAttributeAccessor.h */,
+                                55EE5361223B2A2200FBA944 /* SVGAttributeAnimator.cpp */,
+                                55EE5364223B2A2400FBA944 /* SVGAttributeAnimator.h */,
                                 7A3EBEAC21BF0921000D043D /* SVGAttributeOwnerProxy.cpp */,
                                 55346AF021150FAF0059BCDD /* SVGAttributeOwnerProxy.h */,
@@ -16204 +16246 @@
                                 088A0E00126EF1DB00978F7A /* SVGListPropertyTearOff.h */,
                                 08CA3D4312894A3800FFF260 /* SVGMatrixTearOff.h */,
+                                55EE5354223B29E900FBA944 /* SVGMemberAccessor.h */,
+                                55BE025A223B29C20032F08A /* SVGPointerMemberAccessor.h */,
+                                55EE5363223B2A2400FBA944 /* SVGProperty.h */,
+                                55EE5360223B2A2100FBA944 /* SVGPropertyOwner.h */,
+                                55BE025C223B29C30032F08A /* SVGPropertyOwnerRegistry.h */,
+                                55BE0257223B29C00032F08A /* SVGPropertyRegistry.h */,
                                 088A0E02126EF1DB00978F7A /* SVGPropertyTearOff.h */,
                                 088A0E03126EF1DB00978F7A /* SVGPropertyTraits.h */,
@@ -24074 +24122 @@
                                 08D46CE2127AD5FC0089694B /* SVGAnimatedEnumeration.h */,
                                 B22277E80D00BF1F0071B782 /* SVGAnimatedEnumeration.idl */,
-                                43F6FD9513BCD0B100224052 /* SVGAnimatedInteger.cpp */,
-                                0823D158127AD6AC000EBC95 /* SVGAnimatedInteger.h */,
                                 B22277E90D00BF1F0071B782 /* SVGAnimatedInteger.idl */,
-                                71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */,
-                                71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */,
                                 4381763A13A697D4007D1187 /* SVGAnimatedLength.cpp */,
                                 089021A8126EF5DE0092D5EA /* SVGAnimatedLength.h */,
@@ -24127 +24171 @@
                                 B22278030D00BF1F0071B782 /* SVGAnimationElement.idl */,
                                 439D334213A6911C00C20F4F /* SVGAnimatorFactory.h */,
+                                723F97BC2238EE08007F079C /* SVGAttributeAnimationController.cpp */,
+                                723F97BD2238EE08007F079C /* SVGAttributeAnimationController.h */,
+                                723F97C122397725007F079C /* SVGAttributeAnimationControllerBase.cpp */,
+                                723F97C022396B88007F079C /* SVGAttributeAnimationControllerBase.h */,
                                 B22278040D00BF1F0071B782 /* svgattrs.in */,
                                 B22278050D00BF1F0071B782 /* SVGCircleElement.cpp */,
@@ -24296 +24344 @@
                                 B22278990D00BF200071B782 /* SVGLangSpace.cpp */,
                                 B222789A0D00BF200071B782 /* SVGLangSpace.h */,
+                                723F97BE2239512D007F079C /* SVGLegacyAttributeAnimationController.cpp */,
+                                723F97BF2239512D007F079C /* SVGLegacyAttributeAnimationController.h */,
                                 7CE58D511DD7B09300128552 /* SVGLength.h */,
                                 B222789E0D00BF200071B782 /* SVGLength.idl */,
@@ -31863 +31913 @@
                                 08D46CE3127AD5FC0089694B /* SVGAnimatedEnumeration.h in Headers */,
                                 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */,
-                                0823D159127AD6AC000EBC95 /* SVGAnimatedInteger.h in Headers */,
-                                71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */,
                                 089021A9126EF5DE0092D5EA /* SVGAnimatedLength.h in Headers */,
                                 089021AD126EF5E90092D5EA /* SVGAnimatedLengthList.h in Headers */,

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

@@ -2500 +2500 @@
     }
 
-    $headerIncludes{"$interfaceName.h"} = 1 if $hasParent && $interface->extendedAttributes->{JSGenerateToNativeObject};
-
     $headerIncludes{"SVGElement.h"} = 1 if $className =~ /^JSSVG/;
 
@@ -2513 +2511 @@
 
     if ($codeGenerator->IsSVGAnimatedType($interface->type)) {
-        $headerIncludes{"$interfaceName.h"} = 1;
+        $headerIncludes{"SVGAnimatedPropertyImpl.h"} = 1;
     } else {
+        $headerIncludes{"$interfaceName.h"} = 1 if $hasParent && $interface->extendedAttributes->{JSGenerateToNativeObject};
         # Implementation class forward declaration
         if (IsDOMGlobalObject($interface)) {
@@ -2564 +2563 @@
         push(@headerContent, "    }\n\n");  
     } else {
-        AddIncludesForImplementationTypeInHeader($implType);
+        if (!$codeGenerator->IsSVGAnimatedType($interface->type)) {
+            AddIncludesForImplementationTypeInHeader($implType);
+        }
         push(@headerContent, "    static $className* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<$implType>&& impl)\n");
         push(@headerContent, "    {\n");

trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp

@@ -2 +2 @@
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  * Copyright (C) 2014 Adobe Systems Incorporated. All rights reserved.
@@ -25 +25 @@
 #include "SVGAnimateElementBase.h"
 
-#include "CSSPropertyNames.h"
-#include "CSSPropertyParser.h"
 #include "QualifiedName.h"
-#include "RenderObject.h"
-#include "SVGAnimatorFactory.h"
+#include "SVGAttributeAnimationController.h"
 #include "SVGElement.h"
+#include "SVGLegacyAttributeAnimationController.h"
 #include "SVGNames.h"
-#include "StyleProperties.h"
 #include <wtf/IsoMallocInlines.h>
 
@@ -41 +38 @@
 SVGAnimateElementBase::SVGAnimateElementBase(const QualifiedName& tagName, Document& document)
     : SVGAnimationElement(tagName, document)
-    , m_animatedPropertyType(AnimatedString)
 {
     ASSERT(hasTagName(SVGNames::animateTag) || hasTagName(SVGNames::setTag) || hasTagName(SVGNames::animateColorTag) || hasTagName(SVGNames::animateTransformTag));
@@ -48 +44 @@
 SVGAnimateElementBase::~SVGAnimateElementBase() = default;
 
-bool SVGAnimateElementBase::hasValidAttributeType()
+SVGAttributeAnimationControllerBase& SVGAnimateElementBase::attributeAnimationController()
 {
-    if (!this->targetElement())
+    ASSERT(targetElement());
+    ASSERT(!hasInvalidCSSAttributeType());
+
+    if (!m_attributeAnimationController) {
+        if (targetElement()->isAnimatedPropertyAttribute(attributeName()))
+            m_attributeAnimationController = std::make_unique<SVGAttributeAnimationController>(*this, *targetElement());
+        else
+            m_attributeAnimationController = std::make_unique<SVGLegacyAttributeAnimationController>(*this, *targetElement());
+    }
+
+    return *m_attributeAnimationController;
+}
+
+bool SVGAnimateElementBase::hasValidAttributeType() const
+{
+    if (!targetElement() || hasInvalidCSSAttributeType())
         return false;
 
-    return m_animatedPropertyType != AnimatedUnknown && !hasInvalidCSSAttributeType();
+    if (determineAnimatedPropertyType(*targetElement()) != AnimatedUnknown)
+        return true;
+
+    return targetElement()->isAnimatedPropertyAttribute(attributeName());
 }
 
 AnimatedPropertyType SVGAnimateElementBase::determineAnimatedPropertyType(SVGElement& targetElement) const
 {
-    auto propertyTypes = targetElement.animatedPropertyTypesForAttribute(attributeName());
-    if (propertyTypes.isEmpty())
-        return AnimatedUnknown;
-
-    ASSERT(propertyTypes.size() <= 2);
-    AnimatedPropertyType type = propertyTypes[0];
-    if (hasTagName(SVGNames::animateColorTag) && type != AnimatedColor)
-        return AnimatedUnknown;
-
-    // Animations of transform lists are not allowed for <animate> or <set>
-    // http://www.w3.org/TR/SVG/animate.html#AnimationAttributesAndProperties
-    if (type == AnimatedTransformList && !hasTagName(SVGNames::animateTransformTag))
-        return AnimatedUnknown;
-
-    // Fortunately there's just one special case needed here: SVGMarkerElements orientAttr, which
-    // corresponds to SVGAnimatedAngle orientAngle and SVGAnimatedEnumeration orientType. We have to
-    // figure out whose value to change here.
-    if (targetElement.hasTagName(SVGNames::markerTag) && type == AnimatedAngle) {
-        ASSERT(propertyTypes.size() == 2);
-        ASSERT(propertyTypes[0] == AnimatedAngle);
-        ASSERT(propertyTypes[1] == AnimatedEnumeration);
-    } else if (propertyTypes.size() == 2)
-        ASSERT(propertyTypes[0] == propertyTypes[1]);
-
-    return type;
+    return SVGAttributeAnimationControllerBase::determineAnimatedPropertyType(*this, targetElement, attributeName());
 }
 
 void SVGAnimateElementBase::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement)
 {
-    ASSERT(resultElement);
-    auto targetElement = makeRefPtr(this->targetElement());
-    if (!targetElement)
+    if (!targetElement())
         return;
-
-    const QualifiedName& attributeName = this->attributeName();
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-    
-    if (shouldApply == DontApplyAnimation)
-        return;
-
-    ASSERT(m_animatedPropertyType == determineAnimatedPropertyType(*targetElement));
-
-    ASSERT(percentage >= 0 && percentage <= 1);
-    ASSERT(m_animatedPropertyType != AnimatedTransformList || hasTagName(SVGNames::animateTransformTag));
-    ASSERT(m_animatedPropertyType != AnimatedUnknown);
-    ASSERT(m_animator);
-    ASSERT(m_animator->type() == m_animatedPropertyType);
-    ASSERT(m_fromType);
-    ASSERT(m_fromType->type() == m_animatedPropertyType);
-    ASSERT(m_toType);
-
-    if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
-        // SVG DOM animVal animation code-path.
-        if (m_animator->findAnimatedPropertiesForAttributeName(*targetElement, attributeName).isEmpty())
-            return;
-    }
-
-    SVGAnimateElementBase& resultAnimationElement = downcast<SVGAnimateElementBase>(*resultElement);
-    ASSERT(resultAnimationElement.m_animatedType);
-    ASSERT(resultAnimationElement.m_animatedPropertyType == m_animatedPropertyType);
-
-    if (hasTagName(SVGNames::setTag))
-        percentage = 1;
-
-    if (calcMode() == CalcMode::Discrete)
-        percentage = percentage < 0.5 ? 0 : 1;
-
-    // Target element might have changed.
-    m_animator->setContextElement(targetElement.get());
-
-    // Be sure to detach list wrappers before we modfiy their underlying value. If we'd do
-    // if after calculateAnimatedValue() ran the cached pointers in the list propery tear
-    // offs would point nowhere, and we couldn't create copies of those values anymore,
-    // while detaching. This is covered by assertions, moving this down would fire them.
-    if (!m_animatedProperties.isEmpty())
-        m_animator->animValWillChange(m_animatedProperties);
-
-    // Values-animation accumulates using the last values entry corresponding to the end of duration time.
-    SVGAnimatedType* toAtEndOfDurationType = m_toAtEndOfDurationType ? m_toAtEndOfDurationType.get() : m_toType.get();
-    m_animator->calculateAnimatedValue(percentage, repeatCount, m_fromType.get(), m_toType.get(), toAtEndOfDurationType, resultAnimationElement.m_animatedType.get());
+    attributeAnimationController().calculateAnimatedValue(percentage, repeatCount, resultElement);
 }
 
 bool SVGAnimateElementBase::calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString)
 {
-    if (toAtEndOfDurationString.isEmpty())
+    if (!targetElement())
         return false;
-    m_toAtEndOfDurationType = ensureAnimator()->constructFromString(toAtEndOfDurationString);
-    return true;
+    return attributeAnimationController().calculateToAtEndOfDurationValue(toAtEndOfDurationString);
 }
 
 bool SVGAnimateElementBase::calculateFromAndToValues(const String& fromString, const String& toString)
 {
-    if (!this->targetElement())
+    if (!targetElement())
         return false;
-
-    determinePropertyValueTypes(fromString, toString);
-    ensureAnimator()->calculateFromAndToValues(m_fromType, m_toType, fromString, toString);
-    ASSERT(m_animatedPropertyType == m_animator->type());
-    return true;
+    return attributeAnimationController().calculateFromAndToValues(fromString, toString);
 }
 
@@ -163 +100 @@
     if (!this->targetElement())
         return false;
-
-    if (animationMode() == AnimationMode::By && !isAdditive())
-        return false;
-
-    // from-by animation may only be used with attributes that support addition (e.g. most numeric attributes).
-    if (animationMode() == AnimationMode::FromBy && !animatedPropertyTypeSupportsAddition())
-        return false;
-
-    ASSERT(!hasTagName(SVGNames::setTag));
-
-    determinePropertyValueTypes(fromString, byString);
-    ensureAnimator()->calculateFromAndByValues(m_fromType, m_toType, fromString, byString);
-    ASSERT(m_animatedPropertyType == m_animator->type());
-    return true;
+    return attributeAnimationController().calculateFromAndByValues(fromString, byString);
 }
-
-#ifndef NDEBUG
-static inline bool propertyTypesAreConsistent(AnimatedPropertyType expectedPropertyType, const SVGElementAnimatedPropertyList& animatedTypes)
-{
-    for (auto& type : animatedTypes) {
-        for (auto& property : type.properties) {
-            if (expectedPropertyType != property->animatedPropertyType()) {
-                // This is the only allowed inconsistency. SVGAnimatedAngleAnimator handles both SVGAnimatedAngle & SVGAnimatedEnumeration for markers orient attribute.
-                if (expectedPropertyType == AnimatedAngle && property->animatedPropertyType() == AnimatedEnumeration)
-                    return true;
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-#endif
 
 void SVGAnimateElementBase::resetAnimatedType()
 {
-    SVGAnimatedTypeAnimator* animator = ensureAnimator();
-    ASSERT(m_animatedPropertyType == animator->type());
-
-    auto targetElement = makeRefPtr(this->targetElement());
-    if (!targetElement)
+    if (!targetElement())
         return;
-
-    const QualifiedName& attributeName = this->attributeName();
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-
-    if (shouldApply == DontApplyAnimation)
-        return;
-
-    if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
-        // SVG DOM animVal animation code-path.
-        m_animatedProperties = animator->findAnimatedPropertiesForAttributeName(*targetElement, attributeName);
-        if (m_animatedProperties.isEmpty())
-            return;
-
-        ASSERT(propertyTypesAreConsistent(m_animatedPropertyType, m_animatedProperties));
-        if (!m_animatedType)
-            m_animatedType = animator->startAnimValAnimation(m_animatedProperties);
-        else {
-            animator->resetAnimValToBaseVal(m_animatedProperties, *m_animatedType);
-            animator->animValDidChange(m_animatedProperties);
-        }
-        return;
-    }
-
-    // CSS properties animation code-path.
-    ASSERT(m_animatedProperties.isEmpty());
-    String baseValue;
-
-    if (shouldApply == ApplyCSSAnimation) {
-        ASSERT(SVGAnimationElement::isTargetAttributeCSSProperty(targetElement.get(), attributeName));
-        computeCSSPropertyValue(targetElement.get(), cssPropertyID(attributeName.localName()), baseValue);
-    }
-
-    if (!m_animatedType)
-        m_animatedType = animator->constructFromString(baseValue);
-    else
-        m_animatedType->setValueAsString(attributeName, baseValue);
-}
-
-static inline void applyCSSPropertyToTarget(SVGElement& targetElement, CSSPropertyID id, const String& value)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-
-    if (!targetElement.ensureAnimatedSMILStyleProperties().setProperty(id, value, false))
-        return;
-
-    targetElement.invalidateStyle();
-}
-
-static inline void removeCSSPropertyFromTarget(SVGElement& targetElement, CSSPropertyID id)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-    targetElement.ensureAnimatedSMILStyleProperties().removeProperty(id);
-    targetElement.invalidateStyle();
-}
-
-static inline void applyCSSPropertyToTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName, const String& valueAsString)
-{
-    // FIXME: Do we really need to check both isConnected and !parentNode?
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    CSSPropertyID id = cssPropertyID(attributeName.localName());
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    applyCSSPropertyToTarget(targetElement, id, valueAsString);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        applyCSSPropertyToTarget(*instance, id, valueAsString);
-}
-
-static inline void removeCSSPropertyFromTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    // FIXME: Do we really need to check both isConnected and !parentNode?
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    CSSPropertyID id = cssPropertyID(attributeName.localName());
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    removeCSSPropertyFromTarget(targetElement, id);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        removeCSSPropertyFromTarget(*instance, id);
-}
-
-static inline void notifyTargetAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-    targetElement.svgAttributeChanged(attributeName);
-}
-
-static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    notifyTargetAboutAnimValChange(targetElement, attributeName);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        notifyTargetAboutAnimValChange(*instance, attributeName);
+    attributeAnimationController().resetAnimatedType();
 }
 
 void SVGAnimateElementBase::clearAnimatedType(SVGElement* targetElement)
 {
-    if (!m_animatedType)
+    if (!targetElement)
         return;
 
-    // If the SVGAnimatedType is a list type, e.g. SVGLengthListValues, the wrappers of the
-    // animated properties have to be detached from the items in the list before it's deleted.
-    if (!m_animatedProperties.isEmpty())
-        m_animator->animValWillChange(m_animatedProperties);
-
-    if (!targetElement) {
-        m_animatedType = nullptr;
-        return;
-    }
-
-    if (m_animatedProperties.isEmpty()) {
-        // CSS properties animation code-path.
-        removeCSSPropertyFromTargetAndInstances(*targetElement, attributeName());
-        m_animatedType = nullptr;
-        return;
-    }
-
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName());
-    if (shouldApply == ApplyXMLandCSSAnimation)
-        removeCSSPropertyFromTargetAndInstances(*targetElement, attributeName());
-
-    // SVG DOM animVal animation code-path.
-    if (m_animator) {
-        m_animator->stopAnimValAnimation(m_animatedProperties);
-        notifyTargetAndInstancesAboutAnimValChange(*targetElement, attributeName());
-    }
-
-    m_animatedProperties.clear();
-    m_animatedType = nullptr;
+    if (auto* controller = attributeAnimationControllerIfExists())
+        controller->clearAnimatedType(targetElement);
 }
 
 void SVGAnimateElementBase::applyResultsToTarget()
 {
-    ASSERT(m_animatedPropertyType != AnimatedTransformList || hasTagName(SVGNames::animateTransformTag));
-    ASSERT(m_animatedPropertyType != AnimatedUnknown);
-    ASSERT(m_animator);
-
-    // Early exit if our animated type got destroyed by a previous endedActiveInterval().
-    if (!m_animatedType)
+    if (!targetElement())
         return;
-
-    auto targetElement = makeRefPtr(this->targetElement());
-    const QualifiedName& attributeName = this->attributeName();
-
-    ASSERT(targetElement);
-
-    if (m_animatedProperties.isEmpty()) {
-        // CSS properties animation code-path.
-        // Convert the result of the animation to a String and apply it as CSS property on the target & all instances.
-        applyCSSPropertyToTargetAndInstances(*targetElement, attributeName, m_animatedType->valueAsString());
-        return;
-    }
-
-    // We do update the style and the animation property independent of each other.
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-    if (shouldApply == ApplyXMLandCSSAnimation)
-        applyCSSPropertyToTargetAndInstances(*targetElement, attributeName, m_animatedType->valueAsString());
-
-    // SVG DOM animVal animation code-path.
-    // At this point the SVG DOM values are already changed, unlike for CSS.
-    // We only have to trigger update notifications here.
-    m_animator->animValDidChange(m_animatedProperties);
-    notifyTargetAndInstancesAboutAnimValChange(*targetElement, attributeName);
-}
-
-bool SVGAnimateElementBase::animatedPropertyTypeSupportsAddition() const
-{
-    // Spec: http://www.w3.org/TR/SVG/animate.html#AnimationAttributesAndProperties.
-    switch (m_animatedPropertyType) {
-    case AnimatedBoolean:
-    case AnimatedEnumeration:
-    case AnimatedPreserveAspectRatio:
-    case AnimatedString:
-    case AnimatedUnknown:
-        return false;
-    case AnimatedAngle:
-    case AnimatedColor:
-    case AnimatedInteger:
-    case AnimatedIntegerOptionalInteger:
-    case AnimatedLength:
-    case AnimatedLengthList:
-    case AnimatedNumber:
-    case AnimatedNumberList:
-    case AnimatedNumberOptionalNumber:
-    case AnimatedPath:
-    case AnimatedPoints:
-    case AnimatedRect:
-    case AnimatedTransformList:
-        return true;
-    default:
-        RELEASE_ASSERT_NOT_REACHED();
-        return true;
-    }
+    attributeAnimationController().applyResultsToTarget();
 }
 
@@ -414 +129 @@
 {
     if (animationMode() == AnimationMode::By || animationMode() == AnimationMode::FromBy) {
-        if (!animatedPropertyTypeSupportsAddition())
-            return false;
+        if (auto* controller = attributeAnimationControllerIfExists()) {
+            if (!controller->isAdditive())
+                return false;
+        }
     }
 
@@ -424 +141 @@
 {
     // FIXME: A return value of float is not enough to support paced animations on lists.
-    if (!this->targetElement())
+    if (!targetElement())
         return -1;
 
-    return ensureAnimator()->calculateDistance(fromString, toString);
+    return attributeAnimationController().calculateDistance(fromString, toString);
 }
 
@@ -433 +150 @@
 {
     SVGAnimationElement::setTargetElement(target);
-    resetAnimatedPropertyType();
+    resetAnimation();
 }
 
@@ -439 +156 @@
 {
     SVGSMILElement::setAttributeName(attributeName);
-    checkInvalidCSSAttributeType(targetElement());
-    resetAnimatedPropertyType();
+    resetAnimation();
 }
 
-void SVGAnimateElementBase::resetAnimatedPropertyType()
+void SVGAnimateElementBase::resetAnimation()
 {
-    SVGAnimationElement::resetAnimatedPropertyType();
-    ASSERT(!m_animatedType);
-    m_fromType = nullptr;
-    m_toType = nullptr;
-    m_toAtEndOfDurationType = nullptr;
-    m_animator = nullptr;
-    m_animatedPropertyType = targetElement() ? determineAnimatedPropertyType(*targetElement()) : AnimatedString;
+    SVGAnimationElement::resetAnimation();
+    m_attributeAnimationController = nullptr;
+    m_hasInvalidCSSAttributeType = WTF::nullopt;
 }
 
-SVGAnimatedTypeAnimator* SVGAnimateElementBase::ensureAnimator()
+bool SVGAnimateElementBase::hasInvalidCSSAttributeType() const
 {
-    if (!m_animator)
-        m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animatedPropertyType);
-    ASSERT(m_animatedPropertyType == m_animator->type());
-    return m_animator.get();
+    if (!targetElement())
+        return false;
+
+    if (!m_hasInvalidCSSAttributeType)
+        m_hasInvalidCSSAttributeType = hasValidAttributeName() && attributeType() == AttributeType::CSS && !isTargetAttributeCSSProperty(targetElement(), attributeName());
+
+    return m_hasInvalidCSSAttributeType.value();
 }
 

trunk/Source/WebCore/svg/SVGAnimateElementBase.h

@@ -24 +24 @@
 #pragma once
 
-#include "SVGAnimatedType.h"
-#include "SVGAnimatedTypeAnimator.h"
 #include "SVGAnimationElement.h"
 #include "SVGNames.h"
 
 namespace WebCore {
+
+class SVGAttributeAnimationControllerBase;
 
 class SVGAnimateElementBase : public SVGAnimationElement {
@@ -36 +36 @@
     virtual ~SVGAnimateElementBase();
 
+    SVGAttributeAnimationControllerBase& attributeAnimationController();
+    SVGAttributeAnimationControllerBase* attributeAnimationControllerIfExists() const { return m_attributeAnimationController.get(); }
+
     AnimatedPropertyType determineAnimatedPropertyType(SVGElement&) const;
 
 protected:
     SVGAnimateElementBase(const QualifiedName&, Document&);
+
+    bool hasValidAttributeType() const override;
 
     void resetAnimatedType() override;
@@ -54 +59 @@
     void setTargetElement(SVGElement*) override;
     void setAttributeName(const QualifiedName&) override;
-    void resetAnimatedPropertyType() override;
-
-    AnimatedPropertyType m_animatedPropertyType;
+    void resetAnimation() override;
 
 private:
-    SVGAnimatedTypeAnimator* ensureAnimator();
-    bool animatedPropertyTypeSupportsAddition() const;
+    bool hasInvalidCSSAttributeType() const;
 
-    bool hasValidAttributeType() override;
-
-    std::unique_ptr<SVGAnimatedType> m_fromType;
-    std::unique_ptr<SVGAnimatedType> m_toType;
-    std::unique_ptr<SVGAnimatedType> m_toAtEndOfDurationType;
-    std::unique_ptr<SVGAnimatedType> m_animatedType;
-
-    SVGElementAnimatedPropertyList m_animatedProperties;
-    std::unique_ptr<SVGAnimatedTypeAnimator> m_animator;
+    mutable Optional<bool> m_hasInvalidCSSAttributeType;
+    std::unique_ptr<SVGAttributeAnimationControllerBase> m_attributeAnimationController;
 };
 

trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp

@@ -58 +58 @@
 }
 
-bool SVGAnimateMotionElement::hasValidAttributeType()
+bool SVGAnimateMotionElement::hasValidAttributeType() const
 {
     auto targetElement = makeRefPtr(this->targetElement());
@@ -91 +91 @@
 }
 
-bool SVGAnimateMotionElement::hasValidAttributeName()
+bool SVGAnimateMotionElement::hasValidAttributeName() const
 {
     // AnimateMotion does not use attributeName so it is always valid.

trunk/Source/WebCore/svg/SVGAnimateMotionElement.h

@@ -37 +37 @@
     SVGAnimateMotionElement(const QualifiedName&, Document&);
 
-    bool hasValidAttributeType() override;
-    bool hasValidAttributeName() override;
+    bool hasValidAttributeType() const override;
+    bool hasValidAttributeName() const override;
 
     void parseAttribute(const QualifiedName&, const AtomicString&) override;

trunk/Source/WebCore/svg/SVGAnimateTransformElement.cpp

@@ -44 +44 @@
 }
 
-bool SVGAnimateTransformElement::hasValidAttributeType()
+bool SVGAnimateTransformElement::hasValidAttributeType() const
 {
     if (!this->targetElement())
@@ -52 +52 @@
         return false;
 
-    return m_animatedPropertyType == AnimatedTransformList;
+    return SVGAnimateElementBase::hasValidAttributeType();
 }
 

trunk/Source/WebCore/svg/SVGAnimateTransformElement.h

@@ -40 +40 @@
     SVGAnimateTransformElement(const QualifiedName&, Document&);
     
-    bool hasValidAttributeType() final;
+    bool hasValidAttributeType() const final;
     void parseAttribute(const QualifiedName&, const AtomicString&) final;
 

trunk/Source/WebCore/svg/SVGAnimatedPointList.h

@@ -23 +23 @@
 #include "SVGAnimatedListPropertyTearOff.h"
 #include "SVGAnimatedTypeAnimator.h"
+#include "SVGAttribute.h"
+#include "SVGAttributeAccessor.h"
 #include "SVGPointList.h"
 

trunk/Source/WebCore/svg/SVGAnimationElement.cpp

@@ -306 +306 @@
     else
         m_attributeType = AttributeType::Auto;
-    checkInvalidCSSAttributeType(targetElement());
 }
 
@@ -668 +667 @@
         m_toPropertyValueType = InheritValue;
 }
-void SVGAnimationElement::resetAnimatedPropertyType()
+void SVGAnimationElement::resetAnimation()
 {
     m_lastValuesAnimationFrom = String();
@@ -674 +673 @@
 }
 
-void SVGAnimationElement::setTargetElement(SVGElement* target)
-{
-    SVGSMILElement::setTargetElement(target);
-    checkInvalidCSSAttributeType(target);
-}
-
-void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target)
-{
-    m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attributeType() == AttributeType::CSS && !isTargetAttributeCSSProperty(target, attributeName());
-}
-
-}
+}

trunk/Source/WebCore/svg/SVGAnimationElement.h

@@ -37 +37 @@
 class TimeContainer;
 
-enum class AnimationMode : uint8_t {
-    None,
-    FromTo,
-    FromBy,
-    To,
-    By,
-    Values,
-    Path // Used by AnimateMotion.
-};
-
 // If we have 'currentColor' or 'inherit' as animation value, we need to grab
 // the value during the animation since the value can be animated itself.
 enum AnimatedPropertyValueType { RegularPropertyValue, CurrentColorValue, InheritValue };
-
-enum class CalcMode : uint8_t { Discrete, Linear, Paced, Spline };
 
 class SVGAnimationElement : public SVGSMILElement, public SVGExternalResourcesRequired, public SVGTests {
@@ -147 +135 @@
     }
 
+    enum class AttributeType : uint8_t { CSS, XML, Auto };
+    AttributeType attributeType() const { return m_attributeType; }
+
+    void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
+    virtual void determinePropertyValueTypes(const String& from, const String& to);
+
 protected:
     SVGAnimationElement(const QualifiedName&, Document&);
@@ -154 +148 @@
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const override { return m_attributeOwnerProxy; }
 
-    void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
-    virtual void determinePropertyValueTypes(const String& from, const String& to);
-    virtual void resetAnimatedPropertyType();
+    virtual void resetAnimation();
 
     static bool isSupportedAttribute(const QualifiedName&);
@@ -162 +154 @@
     void svgAttributeChanged(const QualifiedName&) override;
 
-    enum class AttributeType { CSS, XML, Auto };
-    AttributeType attributeType() const { return m_attributeType; }
-
     String toValue() const;
     String byValue() const;
@@ -178 +167 @@
     AnimatedPropertyValueType m_toPropertyValueType { RegularPropertyValue };
 
-    void setTargetElement(SVGElement*) override;
     void setAttributeName(const QualifiedName&) override { }
-    bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeType; }
-    void checkInvalidCSSAttributeType(SVGElement*);
 
     virtual void updateAnimationMode();
@@ -219 +205 @@
     String m_lastValuesAnimationFrom;
     String m_lastValuesAnimationTo;
-    bool m_hasInvalidCSSAttributeType { false };
     CalcMode m_calcMode { CalcMode::Linear };
     AnimationMode m_animationMode { AnimationMode::None };

trunk/Source/WebCore/svg/SVGAnimatorFactory.h

@@ -24 +24 @@
 #include "SVGAnimatedColor.h"
 #include "SVGAnimatedEnumeration.h"
-#include "SVGAnimatedInteger.h"
-#include "SVGAnimatedIntegerOptionalInteger.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedLengthList.h"
@@ -59 +57 @@
             return std::make_unique<SVGAnimatedEnumerationAnimator>(animationElement, contextElement);
         case AnimatedInteger:
-            return std::make_unique<SVGAnimatedIntegerAnimator>(animationElement, contextElement);
+            return nullptr;
         case AnimatedIntegerOptionalInteger:
-            return std::make_unique<SVGAnimatedIntegerOptionalIntegerAnimator>(animationElement, contextElement);
+            return nullptr;
         case AnimatedLength:
             return std::make_unique<SVGAnimatedLengthAnimator>(animationElement, contextElement);

trunk/Source/WebCore/svg/SVGAttributeAnimationController.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "SVGAttributeAnimationControllerBase.h"
 
 namespace WebCore {
 
-class SVGAttribute;
+class SVGAnimationElement;
 class SVGElement;
-class SVGLegacyAnimatedProperty;
+class SVGSMILElement;
 
-class SVGAttributeOwnerProxy {
+class SVGAttributeAnimationController : public SVGAttributeAnimationControllerBase {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    SVGAttributeAnimationController(SVGAnimationElement&, SVGElement&);
+    
+private:
+    SVGAttributeAnimator* animator() const;
+    SVGAttributeAnimator* animatorIfExists() const { return m_animator.get(); }
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    void resetAnimatedType() override;
+    void clearAnimatedType(SVGElement* targetElement) override;
+    
+    bool calculateFromAndToValues(const String& fromString, const String& toString) override;
+    bool calculateFromAndByValues(const String& fromString, const String& byString) override;
+    bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) override;
 
-    SVGElement& element() const;
+    void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement) override;
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
+    void applyResultsToTarget() override;
+    float calculateDistance(const String& fromString, const String& toString) override;
+    
+    bool isAdditive() const override;
+    bool hasValidAttributeType() const override;
 
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
+    bool isDiscreteAnimator() const;
 
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
-
-protected:
-    WeakPtr<SVGElement> m_element;
+    mutable std::unique_ptr<SVGAttributeAnimator> m_animator;
 };
 
-}
+} // namespace WebCore

trunk/Source/WebCore/svg/SVGAttributeAnimationControllerBase.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
-
 namespace WebCore {
 
-class SVGAttribute;
+class SVGAnimationElement;
 class SVGElement;
-class SVGLegacyAnimatedProperty;
+class SVGSMILElement;
 
-class SVGAttributeOwnerProxy {
+class SVGAttributeAnimationControllerBase {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    SVGAttributeAnimationControllerBase(SVGAnimationElement&, SVGElement&);
+    virtual ~SVGAttributeAnimationControllerBase() = default;
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    static AnimatedPropertyType determineAnimatedPropertyType(const SVGAnimationElement&, SVGElement&, const QualifiedName&);
 
-    SVGElement& element() const;
+    virtual bool isAdditive() const = 0;
+    virtual bool hasValidAttributeType() const = 0;
+    
+    virtual void resetAnimatedType() = 0;
+    virtual void clearAnimatedType(SVGElement* targetElement) = 0;
+    
+    virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0;
+    virtual bool calculateFromAndByValues(const String& fromString, const String& byString) = 0;
+    virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) = 0;
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
-
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
-
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
-
+    virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement) = 0;
+    virtual void applyResultsToTarget() = 0;
+    
+    virtual float calculateDistance(const String& fromString, const String& toString) = 0;
+    
 protected:
-    WeakPtr<SVGElement> m_element;
+    SVGAnimationElement& m_animationElement;
+    SVGElement& m_targetElement;
 };
 
-}
+} // namespace WebCore
+

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -701 +701 @@
     svgElement->synchronizeAttributes();
     svgElement->elementData()->setAnimatedSVGAttributesAreDirty(false);
+    
+    // FIXME: Delete the SVG tear off properties code from this function
+    
+    // SVGPropertyRegistry::synchronizeAllAttributes() returns the new values of
+    // the properties which have changed but not committed yet.
+    auto map = svgElement->propertyRegistry().synchronizeAllAttributes();
+    for (const auto& entry : map)
+        svgElement->setSynchronizedLazyAttribute(entry.key, entry.value);
 }
 
@@ -707 +715 @@
     if (!elementData() || !elementData()->animatedSVGAttributesAreDirty())
         return;
+
+    // FIXME: Delete the SVG tear off properties code from this function
 
     SVGElement* nonConstThis = const_cast<SVGElement*>(this);
     if (name == anyQName())
         synchronizeAllAnimatedSVGAttribute(nonConstThis);
-    else
+    else if (isAnimatedPropertyAttribute(name)) {
+        // If the value of the property has changed, serialize the new value to the attribute.
+        if (auto value = propertyRegistry().synchronize(name))
+            nonConstThis->setSynchronizedLazyAttribute(name, *value);
+    } else
         nonConstThis->synchronizeAttribute(name);
+}
+
+void SVGElement::commitPropertyChange(SVGAnimatedProperty& animatedProperty)
+{
+    QualifiedName attributeName = propertyRegistry().animatedPropertyAttributeName(animatedProperty);
+    setSynchronizedLazyAttribute(attributeName, animatedProperty.baseValAsString());
+
+    invalidateSVGAttributes();
+    svgAttributeChanged(attributeName);
+}
+
+bool SVGElement::isAnimatedPropertyAttribute(const QualifiedName& attributeName) const
+{
+    return propertyRegistry().isAnimatedPropertyAttribute(attributeName);
+}
+
+bool SVGElement::isAnimatedAttribute(const QualifiedName& attributeName) const
+{
+    return isAnimatedPropertyAttribute(attributeName);
+}
+
+std::unique_ptr<SVGAttributeAnimator> SVGElement::createAnimator(const QualifiedName& attributeName, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive)
+{
+    auto animator = propertyRegistry().createAnimator(attributeName, animationMode, calcMode, isAccumulated, isAdditive);
+    if (!animator)
+        return animator;
+    for (auto* instance : instances())
+        instance->propertyRegistry().appendAnimatedInstance(attributeName, *animator);
+    return animator;
 }
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -23 +23 @@
 #pragma once
 
-#include "SVGAnimatedString.h"
+#include "SVGAnimatedPropertyImpl.h"
 #include "SVGAttributeOwnerProxy.h"
 #include "SVGLangSpace.h"
@@ -29 +29 @@
 #include "SVGNames.h"
 #include "SVGParsingError.h"
+#include "SVGPropertyOwnerRegistry.h"
 #include "StyledElement.h"
 #include <wtf/HashMap.h>
@@ -47 +48 @@
 void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, CSSPropertyID>* propertyNameToIdMap, const QualifiedName& attrName);
 
-class SVGElement : public StyledElement, public SVGLangSpace, public CanMakeWeakPtr<SVGElement> {
+class SVGElement : public StyledElement, public SVGLangSpace, public SVGPropertyOwner, public CanMakeWeakPtr<SVGElement> {
     WTF_MAKE_ISO_ALLOCATED(SVGElement);
 public:
@@ -151 +152 @@
     Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName& name) { return attributeOwnerProxy().lookupOrCreateAnimatedProperties(name); }
 
+    using PropertyRegistry = SVGPropertyOwnerRegistry<SVGElement>;
+    virtual const SVGPropertyRegistry& propertyRegistry() const { return m_propertyRegistry; }
+
+    bool isAnimatedPropertyAttribute(const QualifiedName&) const;
+    bool isAnimatedAttribute(const QualifiedName&) const;
+
+    void commitPropertyChange() override { }
+    void commitPropertyChange(SVGAnimatedProperty&);
+
+    const SVGElement* attributeContextElement() const override { return this; }
+    std::unique_ptr<SVGAttributeAnimator> createAnimator(const QualifiedName&, AnimationMode, CalcMode, bool isAccumulated, bool isAdditive);
+
     // These are needed for the RenderTree, animation and DOM.
     const auto& className() const { return m_className.currentValue(attributeOwnerProxy()); }
@@ -205 +218 @@
     AttributeOwnerProxy m_attributeOwnerProxy { *this };
     SVGAnimatedStringAttribute m_className;
+    
+    PropertyRegistry m_propertyRegistry { *this };
 };
 

trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.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
@@ -41 +41 @@
     ASSERT(hasTagName(SVGNames::feConvolveMatrixTag));
     registerAttributes();
+
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        PropertyRegistry::registerProperty<SVGNames::orderAttr, &SVGFEConvolveMatrixElement::m_orderX, &SVGFEConvolveMatrixElement::m_orderY>();
+        PropertyRegistry::registerProperty<SVGNames::targetXAttr, &SVGFEConvolveMatrixElement::m_targetX>();
+        PropertyRegistry::registerProperty<SVGNames::targetYAttr, &SVGFEConvolveMatrixElement::m_targetY>();
+    });
 }
 
@@ -60 +67 @@
 }
 
-const AtomicString& SVGFEConvolveMatrixElement::orderXIdentifier()
-{
-    static NeverDestroyed<AtomicString> s_identifier("SVGOrderX", AtomicString::ConstructFromLiteral);
-    return s_identifier;
-}
-
-const AtomicString& SVGFEConvolveMatrixElement::orderYIdentifier()
-{
-    static NeverDestroyed<AtomicString> s_identifier("SVGOrderY", AtomicString::ConstructFromLiteral);
-    return s_identifier;
-}
-
 void SVGFEConvolveMatrixElement::registerAttributes()
 {
@@ -78 +73 @@
         return;
     registry.registerAttribute<SVGNames::inAttr, &SVGFEConvolveMatrixElement::m_in1>();
-    registry.registerAttribute<SVGNames::orderAttr,
-        &SVGFEConvolveMatrixElement::orderXIdentifier, &SVGFEConvolveMatrixElement::m_orderX,
-        &SVGFEConvolveMatrixElement::orderYIdentifier, &SVGFEConvolveMatrixElement::m_orderY>();
     registry.registerAttribute<SVGNames::kernelMatrixAttr, &SVGFEConvolveMatrixElement::m_kernelMatrix>();
     registry.registerAttribute<SVGNames::divisorAttr, &SVGFEConvolveMatrixElement::m_divisor>();
     registry.registerAttribute<SVGNames::biasAttr, &SVGFEConvolveMatrixElement::m_bias>();
-    registry.registerAttribute<SVGNames::targetXAttr, &SVGFEConvolveMatrixElement::m_targetX>();
-    registry.registerAttribute<SVGNames::targetYAttr, &SVGFEConvolveMatrixElement::m_targetY>();
     registry.registerAttribute<SVGNames::edgeModeAttr, EdgeModeType, &SVGFEConvolveMatrixElement::m_edgeMode>();
     registry.registerAttribute<SVGNames::kernelUnitLengthAttr,
@@ -103 +93 @@
         float x, y;
         if (parseNumberOptionalNumber(value, x, y) && x >= 1 && y >= 1) {
-            m_orderX.setValue(x);
-            m_orderY.setValue(y);
+            m_orderX->setBaseValInternal(x);
+            m_orderY->setBaseValInternal(y);
         } else
             document().accessSVGExtensions().reportWarning("feConvolveMatrix: problem parsing order=\"" + value + "\". Filtered element will not be displayed.");
@@ -142 +132 @@
 
     if (name == SVGNames::targetXAttr) {
-        m_targetX.setValue(value.string().toUIntStrict());
+        m_targetX->setBaseValInternal(value.string().toUIntStrict());
         return;
     }
 
     if (name == SVGNames::targetYAttr) {
-        m_targetY.setValue(value.string().toUIntStrict());
+        m_targetY->setBaseValInternal(value.string().toUIntStrict());
         return;
     }
@@ -198 +188 @@
 void SVGFEConvolveMatrixElement::setOrder(float x, float y)
 {
-    m_orderX.setValue(x);
-    m_orderY.setValue(y);
+    m_orderX->setBaseValInternal(x);
+    m_orderY->setBaseValInternal(y);
     invalidate();
 }

trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.h

@@ -22 +22 @@
 
 #include "FEConvolveMatrix.h"
-#include "SVGAnimatedBoolean.h"
-#include "SVGAnimatedEnumeration.h"
-#include "SVGAnimatedInteger.h"
-#include "SVGAnimatedNumber.h"
-#include "SVGAnimatedNumberList.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
 
@@ -74 +69 @@
 
     String in1() const { return m_in1.currentValue(attributeOwnerProxy()); }
-    int orderX() const { return m_orderX.currentValue(attributeOwnerProxy()); }
-    int orderY() const { return m_orderY.currentValue(attributeOwnerProxy()); }
+    int orderX() const { return m_orderX->currentValue(); }
+    int orderY() const { return m_orderY->currentValue(); }
     const SVGNumberListValues& kernelMatrix() const { return m_kernelMatrix.currentValue(attributeOwnerProxy()); }
     float divisor() const { return m_divisor.currentValue(attributeOwnerProxy()); }
     float bias() const { return m_bias.currentValue(attributeOwnerProxy()); }
-    int targetX() const { return m_targetX.currentValue(attributeOwnerProxy()); }
-    int targetY() const { return m_targetY.currentValue(attributeOwnerProxy()); }
+    int targetX() const { return m_targetX->currentValue(); }
+    int targetY() const { return m_targetY->currentValue(); }
     EdgeModeType edgeMode() const { return m_edgeMode.currentValue(attributeOwnerProxy()); }
     float kernelUnitLengthX() const { return m_kernelUnitLengthX.currentValue(attributeOwnerProxy()); }
@@ -87 +82 @@
 
     RefPtr<SVGAnimatedString> in1Animated() { return m_in1.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedInteger> orderXAnimated() { return m_orderX.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedInteger> orderYAnimated() { return m_orderY.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedInteger& orderXAnimated() { return m_orderX; }
+    SVGAnimatedInteger& orderYAnimated() { return m_orderY; }
     RefPtr<SVGAnimatedNumberList> kernelMatrixAnimated() { return m_kernelMatrix.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedNumber> divisorAnimated() { return m_divisor.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedNumber> biasAnimated() { return m_bias.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedInteger> targetXAnimated() { return m_targetX.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedInteger> targetYAnimated() { return m_targetY.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedInteger& targetXAnimated() { return m_targetX; }
+    SVGAnimatedInteger& targetYAnimated() { return m_targetY; }
     RefPtr<SVGAnimatedEnumeration> edgeModeAnimated() { return m_edgeMode.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedNumber> kernelUnitLengthXAnimated() { return m_kernelUnitLengthX.animatedProperty(attributeOwnerProxy()); }
@@ -106 +101 @@
     static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
     static void registerAttributes();
+    
+    using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEConvolveMatrixElement, SVGFilterPrimitiveStandardAttributes>;
+    const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
 
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
@@ -114 +112 @@
     RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) override;
 
-    static const AtomicString& orderXIdentifier();
-    static const AtomicString& orderYIdentifier();
     static const AtomicString& kernelUnitLengthXIdentifier();
     static const AtomicString& kernelUnitLengthYIdentifier();
 
     AttributeOwnerProxy m_attributeOwnerProxy { *this };
+    PropertyRegistry m_propertyRegistry { *this };
+
     SVGAnimatedStringAttribute m_in1;
-    SVGAnimatedIntegerAttribute m_orderX;
-    SVGAnimatedIntegerAttribute m_orderY;
+    Ref<SVGAnimatedInteger> m_orderX { SVGAnimatedInteger::create(this) };
+    Ref<SVGAnimatedInteger> m_orderY { SVGAnimatedInteger::create(this) };
     SVGAnimatedNumberListAttribute m_kernelMatrix;
     SVGAnimatedNumberAttribute m_divisor;
     SVGAnimatedNumberAttribute m_bias;
-    SVGAnimatedIntegerAttribute m_targetX;
-    SVGAnimatedIntegerAttribute m_targetY;
+    Ref<SVGAnimatedInteger> m_targetX { SVGAnimatedInteger::create(this) };
+    Ref<SVGAnimatedInteger> m_targetY { SVGAnimatedInteger::create(this) };
     SVGAnimatedEnumerationAttribute<EdgeModeType> m_edgeMode { EDGEMODE_DUPLICATE };
     SVGAnimatedNumberAttribute m_kernelUnitLengthX;

trunk/Source/WebCore/svg/SVGFETurbulenceElement.cpp

@@ -36 +36 @@
     ASSERT(hasTagName(SVGNames::feTurbulenceTag));
     registerAttributes();
+    
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        PropertyRegistry::registerProperty<SVGNames::numOctavesAttr, &SVGFETurbulenceElement::m_numOctaves>();
+    });
 }
 
@@ -63 +68 @@
         &SVGFETurbulenceElement::baseFrequencyXIdentifier, &SVGFETurbulenceElement::m_baseFrequencyX,
         &SVGFETurbulenceElement::baseFrequencyYIdentifier, &SVGFETurbulenceElement::m_baseFrequencyY>();
-    registry.registerAttribute<SVGNames::numOctavesAttr, &SVGFETurbulenceElement::m_numOctaves>();
     registry.registerAttribute<SVGNames::seedAttr, &SVGFETurbulenceElement::m_seed>();
     registry.registerAttribute<SVGNames::stitchTilesAttr, SVGStitchOptions, &SVGFETurbulenceElement::m_stitchTiles>();
@@ -100 +104 @@
 
     if (name == SVGNames::numOctavesAttr) {
-        m_numOctaves.setValue(value.string().toUIntStrict());
+        m_numOctaves->setBaseValInternal(value.string().toUIntStrict());
         return;
     }
@@ -127 +131 @@
 void SVGFETurbulenceElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (isKnownAttribute(attrName)) {
+    if (isKnownAttribute(attrName) || PropertyRegistry::isKnownAttribute(attrName)) {
         InstanceInvalidationGuard guard(*this);
         primitiveAttributeChanged(attrName);

trunk/Source/WebCore/svg/SVGFETurbulenceElement.h

@@ -2 +2 @@
  * Copyright (C) 2004, 2005, 2007 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
@@ -24 +24 @@
 #include "FETurbulence.h"
 #include "SVGAnimatedEnumeration.h"
-#include "SVGAnimatedInteger.h"
 #include "SVGAnimatedNumber.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
@@ -101 +100 @@
     float baseFrequencyX() const { return m_baseFrequencyX.currentValue(attributeOwnerProxy()); }
     float baseFrequencyY() const { return m_baseFrequencyY.currentValue(attributeOwnerProxy()); }
-    int numOctaves() const { return m_numOctaves.currentValue(attributeOwnerProxy()); }
+    int numOctaves() const { return m_numOctaves->currentValue(); }
     float seed() const { return m_seed.currentValue(attributeOwnerProxy()); }
     SVGStitchOptions stitchTiles() const { return m_stitchTiles.currentValue(attributeOwnerProxy()); }
@@ -108 +107 @@
     RefPtr<SVGAnimatedNumber> baseFrequencyXAnimated() { return m_baseFrequencyX.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedNumber> baseFrequencyYAnimated() { return m_baseFrequencyY.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedInteger> numOctavesAnimated() { return m_numOctaves.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedInteger& numOctavesAnimated() { return m_numOctaves; }
     RefPtr<SVGAnimatedNumber> seedAnimated() { return m_seed.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedEnumeration> stitchTilesAnimated() { return m_stitchTiles.animatedProperty(attributeOwnerProxy()); }
@@ -120 +119 @@
     static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
     static void registerAttributes();
+    
+    using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFETurbulenceElement, SVGFilterPrimitiveStandardAttributes>;
+    const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
 
     const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
@@ -132 +134 @@
 
     AttributeOwnerProxy m_attributeOwnerProxy { *this };
+    PropertyRegistry m_propertyRegistry { *this };
     SVGAnimatedNumberAttribute m_baseFrequencyX;
     SVGAnimatedNumberAttribute m_baseFrequencyY;
-    SVGAnimatedIntegerAttribute m_numOctaves { 1 };
+    Ref<SVGAnimatedInteger> m_numOctaves { SVGAnimatedInteger::create(this, 1) };
     SVGAnimatedNumberAttribute m_seed;
     SVGAnimatedEnumerationAttribute<SVGStitchOptions> m_stitchTiles { SVG_STITCHTYPE_NOSTITCH };

trunk/Source/WebCore/svg/SVGFilterElement.h

@@ -25 +25 @@
 
 #include "SVGAnimatedEnumeration.h"
-#include "SVGAnimatedInteger.h"
 #include "SVGAnimatedLength.h"
 #include "SVGElement.h"

trunk/Source/WebCore/svg/SVGLegacyAttributeAnimationController.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- * Copyright (C) Research In Motion Limited 2011. All rights reserved.
- * Copyright (C) 2014 Adobe Systems Incorporated. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "SVGAnimateElementBase.h"
+#include "SVGLegacyAttributeAnimationController.h"
 
 #include "CSSPropertyNames.h"
 #include "CSSPropertyParser.h"
 #include "QualifiedName.h"
-#include "RenderObject.h"
+#include "SVGAnimateElementBase.h"
+#include "SVGAnimationElement.h"
 #include "SVGAnimatorFactory.h"
 #include "SVGElement.h"
@@ -37 +40 @@
 namespace WebCore {
 
-WTF_MAKE_ISO_ALLOCATED_IMPL(SVGAnimateElementBase);
-
-SVGAnimateElementBase::SVGAnimateElementBase(const QualifiedName& tagName, Document& document)
-    : SVGAnimationElement(tagName, document)
-    , m_animatedPropertyType(AnimatedString)
-{
-    ASSERT(hasTagName(SVGNames::animateTag) || hasTagName(SVGNames::setTag) || hasTagName(SVGNames::animateColorTag) || hasTagName(SVGNames::animateTransformTag));
-}
-
-SVGAnimateElementBase::~SVGAnimateElementBase() = default;
-
-bool SVGAnimateElementBase::hasValidAttributeType()
-{
-    if (!this->targetElement())
-        return false;
-
-    return m_animatedPropertyType != AnimatedUnknown && !hasInvalidCSSAttributeType();
-}
-
-AnimatedPropertyType SVGAnimateElementBase::determineAnimatedPropertyType(SVGElement& targetElement) const
-{
-    auto propertyTypes = targetElement.animatedPropertyTypesForAttribute(attributeName());
-    if (propertyTypes.isEmpty())
-        return AnimatedUnknown;
-
-    ASSERT(propertyTypes.size() <= 2);
-    AnimatedPropertyType type = propertyTypes[0];
-    if (hasTagName(SVGNames::animateColorTag) && type != AnimatedColor)
-        return AnimatedUnknown;
-
-    // Animations of transform lists are not allowed for <animate> or <set>
-    // http://www.w3.org/TR/SVG/animate.html#AnimationAttributesAndProperties
-    if (type == AnimatedTransformList && !hasTagName(SVGNames::animateTransformTag))
-        return AnimatedUnknown;
-
-    // Fortunately there's just one special case needed here: SVGMarkerElements orientAttr, which
-    // corresponds to SVGAnimatedAngle orientAngle and SVGAnimatedEnumeration orientType. We have to
-    // figure out whose value to change here.
-    if (targetElement.hasTagName(SVGNames::markerTag) && type == AnimatedAngle) {
-        ASSERT(propertyTypes.size() == 2);
-        ASSERT(propertyTypes[0] == AnimatedAngle);
-        ASSERT(propertyTypes[1] == AnimatedEnumeration);
-    } else if (propertyTypes.size() == 2)
-        ASSERT(propertyTypes[0] == propertyTypes[1]);
-
-    return type;
-}
-
-void SVGAnimateElementBase::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement)
-{
-    ASSERT(resultElement);
-    auto targetElement = makeRefPtr(this->targetElement());
-    if (!targetElement)
-        return;
-
-    const QualifiedName& attributeName = this->attributeName();
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-    
-    if (shouldApply == DontApplyAnimation)
-        return;
-
-    ASSERT(m_animatedPropertyType == determineAnimatedPropertyType(*targetElement));
-
-    ASSERT(percentage >= 0 && percentage <= 1);
-    ASSERT(m_animatedPropertyType != AnimatedTransformList || hasTagName(SVGNames::animateTransformTag));
-    ASSERT(m_animatedPropertyType != AnimatedUnknown);
-    ASSERT(m_animator);
-    ASSERT(m_animator->type() == m_animatedPropertyType);
-    ASSERT(m_fromType);
-    ASSERT(m_fromType->type() == m_animatedPropertyType);
-    ASSERT(m_toType);
-
-    if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
-        // SVG DOM animVal animation code-path.
-        if (m_animator->findAnimatedPropertiesForAttributeName(*targetElement, attributeName).isEmpty())
-            return;
-    }
-
-    SVGAnimateElementBase& resultAnimationElement = downcast<SVGAnimateElementBase>(*resultElement);
-    ASSERT(resultAnimationElement.m_animatedType);
-    ASSERT(resultAnimationElement.m_animatedPropertyType == m_animatedPropertyType);
-
-    if (hasTagName(SVGNames::setTag))
-        percentage = 1;
-
-    if (calcMode() == CalcMode::Discrete)
-        percentage = percentage < 0.5 ? 0 : 1;
-
-    // Target element might have changed.
-    m_animator->setContextElement(targetElement.get());
-
-    // Be sure to detach list wrappers before we modfiy their underlying value. If we'd do
-    // if after calculateAnimatedValue() ran the cached pointers in the list propery tear
-    // offs would point nowhere, and we couldn't create copies of those values anymore,
-    // while detaching. This is covered by assertions, moving this down would fire them.
-    if (!m_animatedProperties.isEmpty())
-        m_animator->animValWillChange(m_animatedProperties);
-
-    // Values-animation accumulates using the last values entry corresponding to the end of duration time.
-    SVGAnimatedType* toAtEndOfDurationType = m_toAtEndOfDurationType ? m_toAtEndOfDurationType.get() : m_toType.get();
-    m_animator->calculateAnimatedValue(percentage, repeatCount, m_fromType.get(), m_toType.get(), toAtEndOfDurationType, resultAnimationElement.m_animatedType.get());
-}
-
-bool SVGAnimateElementBase::calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString)
-{
-    if (toAtEndOfDurationString.isEmpty())
-        return false;
-    m_toAtEndOfDurationType = ensureAnimator()->constructFromString(toAtEndOfDurationString);
-    return true;
-}
-
-bool SVGAnimateElementBase::calculateFromAndToValues(const String& fromString, const String& toString)
-{
-    if (!this->targetElement())
-        return false;
-
-    determinePropertyValueTypes(fromString, toString);
-    ensureAnimator()->calculateFromAndToValues(m_fromType, m_toType, fromString, toString);
+SVGLegacyAttributeAnimationController::SVGLegacyAttributeAnimationController(SVGAnimationElement& animationElement, SVGElement& targetElement)
+    : SVGAttributeAnimationControllerBase(animationElement, targetElement)
+    , m_animatedPropertyType(determineAnimatedPropertyType(animationElement, targetElement, animationElement.attributeName()))
+{
+}
+
+SVGAnimatedTypeAnimator& SVGLegacyAttributeAnimationController::animatedTypeAnimator()
+{
+    if (!m_animator)
+        m_animator = SVGAnimatorFactory::create(&m_animationElement, &m_targetElement, m_animatedPropertyType);
     ASSERT(m_animatedPropertyType == m_animator->type());
-    return true;
-}
-
-bool SVGAnimateElementBase::calculateFromAndByValues(const String& fromString, const String& byString)
-{
-    if (!this->targetElement())
-        return false;
-
-    if (animationMode() == AnimationMode::By && !isAdditive())
-        return false;
-
-    // from-by animation may only be used with attributes that support addition (e.g. most numeric attributes).
-    if (animationMode() == AnimationMode::FromBy && !animatedPropertyTypeSupportsAddition())
-        return false;
-
-    ASSERT(!hasTagName(SVGNames::setTag));
-
-    determinePropertyValueTypes(fromString, byString);
-    ensureAnimator()->calculateFromAndByValues(m_fromType, m_toType, fromString, byString);
-    ASSERT(m_animatedPropertyType == m_animator->type());
-    return true;
-}
-
-#ifndef NDEBUG
-static inline bool propertyTypesAreConsistent(AnimatedPropertyType expectedPropertyType, const SVGElementAnimatedPropertyList& animatedTypes)
-{
-    for (auto& type : animatedTypes) {
-        for (auto& property : type.properties) {
-            if (expectedPropertyType != property->animatedPropertyType()) {
-                // This is the only allowed inconsistency. SVGAnimatedAngleAnimator handles both SVGAnimatedAngle & SVGAnimatedEnumeration for markers orient attribute.
-                if (expectedPropertyType == AnimatedAngle && property->animatedPropertyType() == AnimatedEnumeration)
-                    return true;
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-#endif
-
-void SVGAnimateElementBase::resetAnimatedType()
-{
-    SVGAnimatedTypeAnimator* animator = ensureAnimator();
-    ASSERT(m_animatedPropertyType == animator->type());
-
-    auto targetElement = makeRefPtr(this->targetElement());
-    if (!targetElement)
-        return;
-
-    const QualifiedName& attributeName = this->attributeName();
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-
-    if (shouldApply == DontApplyAnimation)
-        return;
-
-    if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
-        // SVG DOM animVal animation code-path.
-        m_animatedProperties = animator->findAnimatedPropertiesForAttributeName(*targetElement, attributeName);
-        if (m_animatedProperties.isEmpty())
-            return;
-
-        ASSERT(propertyTypesAreConsistent(m_animatedPropertyType, m_animatedProperties));
-        if (!m_animatedType)
-            m_animatedType = animator->startAnimValAnimation(m_animatedProperties);
-        else {
-            animator->resetAnimValToBaseVal(m_animatedProperties, *m_animatedType);
-            animator->animValDidChange(m_animatedProperties);
-        }
-        return;
-    }
-
-    // CSS properties animation code-path.
-    ASSERT(m_animatedProperties.isEmpty());
-    String baseValue;
-
-    if (shouldApply == ApplyCSSAnimation) {
-        ASSERT(SVGAnimationElement::isTargetAttributeCSSProperty(targetElement.get(), attributeName));
-        computeCSSPropertyValue(targetElement.get(), cssPropertyID(attributeName.localName()), baseValue);
-    }
-
-    if (!m_animatedType)
-        m_animatedType = animator->constructFromString(baseValue);
-    else
-        m_animatedType->setValueAsString(attributeName, baseValue);
-}
-
-static inline void applyCSSPropertyToTarget(SVGElement& targetElement, CSSPropertyID id, const String& value)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-
-    if (!targetElement.ensureAnimatedSMILStyleProperties().setProperty(id, value, false))
-        return;
-
-    targetElement.invalidateStyle();
-}
-
-static inline void removeCSSPropertyFromTarget(SVGElement& targetElement, CSSPropertyID id)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-    targetElement.ensureAnimatedSMILStyleProperties().removeProperty(id);
-    targetElement.invalidateStyle();
-}
-
-static inline void applyCSSPropertyToTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName, const String& valueAsString)
-{
-    // FIXME: Do we really need to check both isConnected and !parentNode?
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    CSSPropertyID id = cssPropertyID(attributeName.localName());
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    applyCSSPropertyToTarget(targetElement, id, valueAsString);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        applyCSSPropertyToTarget(*instance, id, valueAsString);
-}
-
-static inline void removeCSSPropertyFromTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    // FIXME: Do we really need to check both isConnected and !parentNode?
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    CSSPropertyID id = cssPropertyID(attributeName.localName());
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    removeCSSPropertyFromTarget(targetElement, id);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        removeCSSPropertyFromTarget(*instance, id);
-}
-
-static inline void notifyTargetAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    ASSERT(!targetElement.m_deletionHasBegun);
-    targetElement.svgAttributeChanged(attributeName);
-}
-
-static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
-{
-    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
-        return;
-
-    SVGElement::InstanceUpdateBlocker blocker(targetElement);
-    notifyTargetAboutAnimValChange(targetElement, attributeName);
-
-    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
-    for (auto* instance : targetElement.instances())
-        notifyTargetAboutAnimValChange(*instance, attributeName);
-}
-
-void SVGAnimateElementBase::clearAnimatedType(SVGElement* targetElement)
-{
-    if (!m_animatedType)
-        return;
-
-    // If the SVGAnimatedType is a list type, e.g. SVGLengthListValues, the wrappers of the
-    // animated properties have to be detached from the items in the list before it's deleted.
-    if (!m_animatedProperties.isEmpty())
-        m_animator->animValWillChange(m_animatedProperties);
-
-    if (!targetElement) {
-        m_animatedType = nullptr;
-        return;
-    }
-
-    if (m_animatedProperties.isEmpty()) {
-        // CSS properties animation code-path.
-        removeCSSPropertyFromTargetAndInstances(*targetElement, attributeName());
-        m_animatedType = nullptr;
-        return;
-    }
-
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName());
-    if (shouldApply == ApplyXMLandCSSAnimation)
-        removeCSSPropertyFromTargetAndInstances(*targetElement, attributeName());
-
-    // SVG DOM animVal animation code-path.
-    if (m_animator) {
-        m_animator->stopAnimValAnimation(m_animatedProperties);
-        notifyTargetAndInstancesAboutAnimValChange(*targetElement, attributeName());
-    }
-
-    m_animatedProperties.clear();
-    m_animatedType = nullptr;
-}
-
-void SVGAnimateElementBase::applyResultsToTarget()
-{
-    ASSERT(m_animatedPropertyType != AnimatedTransformList || hasTagName(SVGNames::animateTransformTag));
-    ASSERT(m_animatedPropertyType != AnimatedUnknown);
-    ASSERT(m_animator);
-
-    // Early exit if our animated type got destroyed by a previous endedActiveInterval().
-    if (!m_animatedType)
-        return;
-
-    auto targetElement = makeRefPtr(this->targetElement());
-    const QualifiedName& attributeName = this->attributeName();
-
-    ASSERT(targetElement);
-
-    if (m_animatedProperties.isEmpty()) {
-        // CSS properties animation code-path.
-        // Convert the result of the animation to a String and apply it as CSS property on the target & all instances.
-        applyCSSPropertyToTargetAndInstances(*targetElement, attributeName, m_animatedType->valueAsString());
-        return;
-    }
-
-    // We do update the style and the animation property independent of each other.
-    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement.get(), attributeName);
-    if (shouldApply == ApplyXMLandCSSAnimation)
-        applyCSSPropertyToTargetAndInstances(*targetElement, attributeName, m_animatedType->valueAsString());
-
-    // SVG DOM animVal animation code-path.
-    // At this point the SVG DOM values are already changed, unlike for CSS.
-    // We only have to trigger update notifications here.
-    m_animator->animValDidChange(m_animatedProperties);
-    notifyTargetAndInstancesAboutAnimValChange(*targetElement, attributeName);
-}
-
-bool SVGAnimateElementBase::animatedPropertyTypeSupportsAddition() const
+    return *m_animator;
+}
+
+bool SVGLegacyAttributeAnimationController::isAdditive() const
 {
     // Spec: http://www.w3.org/TR/SVG/animate.html#AnimationAttributesAndProperties.
@@ -411 +84 @@
 }
 
-bool SVGAnimateElementBase::isAdditive() const
-{
-    if (animationMode() == AnimationMode::By || animationMode() == AnimationMode::FromBy) {
-        if (!animatedPropertyTypeSupportsAddition())
-            return false;
-    }
-
-    return SVGAnimationElement::isAdditive();
-}
-
-float SVGAnimateElementBase::calculateDistance(const String& fromString, const String& toString)
-{
-    // FIXME: A return value of float is not enough to support paced animations on lists.
-    if (!this->targetElement())
-        return -1;
-
-    return ensureAnimator()->calculateDistance(fromString, toString);
-}
-
-void SVGAnimateElementBase::setTargetElement(SVGElement* target)
-{
-    SVGAnimationElement::setTargetElement(target);
-    resetAnimatedPropertyType();
-}
-
-void SVGAnimateElementBase::setAttributeName(const QualifiedName& attributeName)
-{
-    SVGSMILElement::setAttributeName(attributeName);
-    checkInvalidCSSAttributeType(targetElement());
-    resetAnimatedPropertyType();
-}
-
-void SVGAnimateElementBase::resetAnimatedPropertyType()
-{
-    SVGAnimationElement::resetAnimatedPropertyType();
-    ASSERT(!m_animatedType);
-    m_fromType = nullptr;
-    m_toType = nullptr;
-    m_toAtEndOfDurationType = nullptr;
-    m_animator = nullptr;
-    m_animatedPropertyType = targetElement() ? determineAnimatedPropertyType(*targetElement()) : AnimatedString;
-}
-
-SVGAnimatedTypeAnimator* SVGAnimateElementBase::ensureAnimator()
-{
-    if (!m_animator)
-        m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animatedPropertyType);
+bool SVGLegacyAttributeAnimationController::hasValidAttributeType() const
+{
+    return m_animatedPropertyType != AnimatedUnknown;
+}
+
+bool SVGLegacyAttributeAnimationController::calculateFromAndToValues(const String& fromString, const String& toString)
+{
+    m_animationElement.determinePropertyValueTypes(fromString, toString);
+    animatedTypeAnimator().calculateFromAndToValues(m_fromType, m_toType, fromString, toString);
     ASSERT(m_animatedPropertyType == m_animator->type());
-    return m_animator.get();
-}
-
-} // namespace WebCore
+    return true;
+}
+
+bool SVGLegacyAttributeAnimationController::calculateFromAndByValues(const String& fromString, const String& byString)
+{
+    if (m_animationElement.animationMode() == AnimationMode::By && !isAdditive())
+        return false;
+
+    // from-by animation may only be used with attributes that support addition (e.g. most numeric attributes).
+    if (m_animationElement.animationMode() == AnimationMode::FromBy && !isAdditive())
+        return false;
+
+    m_animationElement.determinePropertyValueTypes(fromString, byString);
+    animatedTypeAnimator().calculateFromAndByValues(m_fromType, m_toType, fromString, byString);
+    ASSERT(m_animatedPropertyType == m_animator->type());
+    return true;
+}
+
+bool SVGLegacyAttributeAnimationController::calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString)
+{
+    if (toAtEndOfDurationString.isEmpty())
+        return false;
+    m_toAtEndOfDurationType = animatedTypeAnimator().constructFromString(toAtEndOfDurationString);
+    return true;
+}
+
+#ifndef NDEBUG
+static inline bool propertyTypesAreConsistent(AnimatedPropertyType expectedPropertyType, const SVGElementAnimatedPropertyList& animatedTypes)
+{
+    for (auto& type : animatedTypes) {
+        for (auto& property : type.properties) {
+            if (expectedPropertyType != property->animatedPropertyType()) {
+                // This is the only allowed inconsistency. SVGAnimatedAngleAnimator handles both SVGAnimatedAngle & SVGAnimatedEnumeration for markers orient attribute.
+                if (expectedPropertyType == AnimatedAngle && property->animatedPropertyType() == AnimatedEnumeration)
+                    return true;
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+#endif
+
+void SVGLegacyAttributeAnimationController::resetAnimatedType()
+{
+    SVGAnimatedTypeAnimator& animator = animatedTypeAnimator();
+    ASSERT(m_animatedPropertyType == animator.type());
+
+    const QualifiedName& attributeName = m_animationElement.attributeName();
+    SVGAnimationElement::ShouldApplyAnimation shouldApply = m_animationElement.shouldApplyAnimation(&m_targetElement, attributeName);
+
+    if (shouldApply == SVGAnimationElement::DontApplyAnimation)
+        return;
+
+    if (shouldApply == SVGAnimationElement::ApplyXMLAnimation || shouldApply == SVGAnimationElement::ApplyXMLandCSSAnimation) {
+        // SVG DOM animVal animation code-path.
+        m_animatedProperties = animator.findAnimatedPropertiesForAttributeName(m_targetElement, attributeName);
+        if (m_animatedProperties.isEmpty())
+            return;
+
+        ASSERT(propertyTypesAreConsistent(m_animatedPropertyType, m_animatedProperties));
+        if (!m_animatedType)
+            m_animatedType = animator.startAnimValAnimation(m_animatedProperties);
+        else {
+            animator.resetAnimValToBaseVal(m_animatedProperties, *m_animatedType);
+            animator.animValDidChange(m_animatedProperties);
+        }
+        return;
+    }
+
+    // CSS properties animation code-path.
+    ASSERT(m_animatedProperties.isEmpty());
+    String baseValue;
+
+    if (shouldApply == SVGAnimationElement::ApplyCSSAnimation) {
+        ASSERT(SVGAnimationElement::isTargetAttributeCSSProperty(&m_targetElement, attributeName));
+        m_animationElement.computeCSSPropertyValue(&m_targetElement, cssPropertyID(attributeName.localName()), baseValue);
+    }
+
+    if (!m_animatedType)
+        m_animatedType = animator.constructFromString(baseValue);
+    else
+        m_animatedType->setValueAsString(attributeName, baseValue);
+}
+
+void SVGLegacyAttributeAnimationController::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement)
+{
+    ASSERT(resultElement);
+
+    const QualifiedName& attributeName = m_animationElement.attributeName();
+    SVGAnimationElement::ShouldApplyAnimation shouldApply = m_animationElement.shouldApplyAnimation(&m_targetElement, attributeName);
+    
+    if (shouldApply == SVGAnimationElement::DontApplyAnimation)
+        return;
+
+    ASSERT(m_animatedPropertyType == determineAnimatedPropertyType(m_animationElement, m_targetElement, attributeName));
+
+    ASSERT(percentage >= 0 && percentage <= 1);
+    ASSERT(m_animatedPropertyType != AnimatedTransformList || m_animationElement.hasTagName(SVGNames::animateTransformTag));
+    ASSERT(m_animatedPropertyType != AnimatedUnknown);
+    ASSERT(m_animator);
+    ASSERT(m_animator->type() == m_animatedPropertyType);
+    ASSERT(m_fromType);
+    ASSERT(m_fromType->type() == m_animatedPropertyType);
+    ASSERT(m_toType);
+
+    if (shouldApply == SVGAnimationElement::ApplyXMLAnimation || shouldApply == SVGAnimationElement::ApplyXMLandCSSAnimation) {
+        // SVG DOM animVal animation code-path.
+        if (m_animator->findAnimatedPropertiesForAttributeName(m_targetElement, attributeName).isEmpty())
+            return;
+    }
+
+    SVGAnimateElementBase& resultAnimationElement = downcast<SVGAnimateElementBase>(*resultElement);
+    SVGLegacyAttributeAnimationController& resultAnimationController = static_cast<SVGLegacyAttributeAnimationController&>(resultAnimationElement.attributeAnimationController());
+    
+    ASSERT(resultAnimationController.m_animatedType);
+    ASSERT(resultAnimationController.m_animatedPropertyType == m_animatedPropertyType);
+
+    if (m_animationElement.hasTagName(SVGNames::setTag))
+        percentage = 1;
+
+    if (m_animationElement.calcMode() == CalcMode::Discrete)
+        percentage = percentage < 0.5 ? 0 : 1;
+
+    // Target element might have changed.
+    m_animator->setContextElement(&m_targetElement);
+
+    // Be sure to detach list wrappers before we modfiy their underlying value. If we'd do
+    // if after calculateAnimatedValue() ran the cached pointers in the list propery tear
+    // offs would point nowhere, and we couldn't create copies of those values anymore,
+    // while detaching. This is covered by assertions, moving this down would fire them.
+    if (!m_animatedProperties.isEmpty())
+        m_animator->animValWillChange(m_animatedProperties);
+
+    // Values-animation accumulates using the last values entry corresponding to the end of duration time.
+    SVGAnimatedType* toAtEndOfDurationType = m_toAtEndOfDurationType ? m_toAtEndOfDurationType.get() : m_toType.get();
+    m_animator->calculateAnimatedValue(percentage, repeatCount, m_fromType.get(), m_toType.get(), toAtEndOfDurationType, resultAnimationController.m_animatedType.get());
+}
+
+static inline void applyCSSPropertyToTarget(SVGElement& targetElement, CSSPropertyID id, const String& value)
+{
+    ASSERT(!targetElement.m_deletionHasBegun);
+
+    if (!targetElement.ensureAnimatedSMILStyleProperties().setProperty(id, value, false))
+        return;
+
+    targetElement.invalidateStyle();
+}
+
+static inline void removeCSSPropertyFromTarget(SVGElement& targetElement, CSSPropertyID id)
+{
+    ASSERT(!targetElement.m_deletionHasBegun);
+    targetElement.ensureAnimatedSMILStyleProperties().removeProperty(id);
+    targetElement.invalidateStyle();
+}
+
+static inline void applyCSSPropertyToTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName, const String& valueAsString)
+{
+    // FIXME: Do we really need to check both isConnected and !parentNode?
+    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
+        return;
+
+    CSSPropertyID id = cssPropertyID(attributeName.localName());
+
+    SVGElement::InstanceUpdateBlocker blocker(targetElement);
+    applyCSSPropertyToTarget(targetElement, id, valueAsString);
+
+    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
+    for (auto* instance : targetElement.instances())
+        applyCSSPropertyToTarget(*instance, id, valueAsString);
+}
+
+static inline void removeCSSPropertyFromTargetAndInstances(SVGElement& targetElement, const QualifiedName& attributeName)
+{
+    // FIXME: Do we really need to check both isConnected and !parentNode?
+    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
+        return;
+
+    CSSPropertyID id = cssPropertyID(attributeName.localName());
+
+    SVGElement::InstanceUpdateBlocker blocker(targetElement);
+    removeCSSPropertyFromTarget(targetElement, id);
+
+    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
+    for (auto* instance : targetElement.instances())
+        removeCSSPropertyFromTarget(*instance, id);
+}
+
+static inline void notifyTargetAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
+{
+    ASSERT(!targetElement.m_deletionHasBegun);
+    targetElement.svgAttributeChanged(attributeName);
+}
+
+static inline void notifyTargetAndInstancesAboutAnimValChange(SVGElement& targetElement, const QualifiedName& attributeName)
+{
+    if (attributeName == anyQName() || !targetElement.isConnected() || !targetElement.parentNode())
+        return;
+
+    SVGElement::InstanceUpdateBlocker blocker(targetElement);
+    notifyTargetAboutAnimValChange(targetElement, attributeName);
+
+    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
+    for (auto* instance : targetElement.instances())
+        notifyTargetAboutAnimValChange(*instance, attributeName);
+}
+
+void SVGLegacyAttributeAnimationController::applyResultsToTarget()
+{
+    ASSERT(m_animatedPropertyType != AnimatedTransformList || m_animationElement.hasTagName(SVGNames::animateTransformTag));
+    ASSERT(m_animatedPropertyType != AnimatedUnknown);
+    ASSERT(m_animator);
+
+    // Early exit if our animated type got destroyed by a previous endedActiveInterval().
+    if (!m_animatedType)
+        return;
+
+    const QualifiedName& attributeName = m_animationElement.attributeName();
+
+    if (m_animatedProperties.isEmpty()) {
+        // CSS properties animation code-path.
+        // Convert the result of the animation to a String and apply it as CSS property on the target & all instances.
+        applyCSSPropertyToTargetAndInstances(m_targetElement, attributeName, m_animatedType->valueAsString());
+        return;
+    }
+
+    // We do update the style and the animation property independent of each other.
+    SVGAnimationElement::ShouldApplyAnimation shouldApply = m_animationElement.shouldApplyAnimation(&m_targetElement, attributeName);
+    if (shouldApply == SVGAnimationElement::ApplyXMLandCSSAnimation)
+        applyCSSPropertyToTargetAndInstances(m_targetElement, attributeName, m_animatedType->valueAsString());
+
+    // SVG DOM animVal animation code-path.
+    // At this point the SVG DOM values are already changed, unlike for CSS.
+    // We only have to trigger update notifications here.
+    m_animator->animValDidChange(m_animatedProperties);
+    notifyTargetAndInstancesAboutAnimValChange(m_targetElement, attributeName);
+}
+
+void SVGLegacyAttributeAnimationController::clearAnimatedType(SVGElement* targetElement)
+{
+    if (!m_animatedType)
+        return;
+
+    // If the SVGAnimatedType is a list type, e.g. SVGLengthListValues, the wrappers of the
+    // animated properties have to be detached from the items in the list before it's deleted.
+    if (!m_animatedProperties.isEmpty())
+        m_animator->animValWillChange(m_animatedProperties);
+
+    if (!targetElement) {
+        m_animatedType = nullptr;
+        return;
+    }
+
+    const QualifiedName& attributeName = m_animationElement.attributeName();
+
+    if (m_animatedProperties.isEmpty()) {
+        // CSS properties animation code-path.
+        removeCSSPropertyFromTargetAndInstances(*targetElement, m_animationElement.attributeName());
+        m_animatedType = nullptr;
+        return;
+    }
+
+    SVGAnimationElement::ShouldApplyAnimation shouldApply = m_animationElement.shouldApplyAnimation(targetElement, attributeName);
+    if (shouldApply == SVGAnimationElement::ApplyXMLandCSSAnimation)
+        removeCSSPropertyFromTargetAndInstances(*targetElement, attributeName);
+
+    // SVG DOM animVal animation code-path.
+    if (m_animator) {
+        m_animator->stopAnimValAnimation(m_animatedProperties);
+        notifyTargetAndInstancesAboutAnimValChange(*targetElement, attributeName);
+    }
+
+    m_animatedProperties.clear();
+    m_animatedType = nullptr;
+}
+
+float SVGLegacyAttributeAnimationController::calculateDistance(const String& fromString, const String& toString)
+{
+    return animatedTypeAnimator().calculateDistance(fromString, toString);
+}
+
+}
+

trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp

@@ -310 +310 @@
 }
 
-bool SVGSMILElement::hasValidAttributeName()
+bool SVGSMILElement::hasValidAttributeName() const
 {
     return attributeName() != anyQName();

trunk/Source/WebCore/svg/animation/SVGSMILElement.h

@@ -52 +52 @@
     void removedFromAncestor(RemovalType, ContainerNode&) override;
     
-    virtual bool hasValidAttributeType() = 0;
-    virtual bool hasValidAttributeName();
+    virtual bool hasValidAttributeType() const = 0;
+    virtual bool hasValidAttributeName() const;
     virtual void animationAttributeChanged() = 0;
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +25 @@
 
 #include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#include "SVGAnimatedProperty.h"
+
+#include "SVGElement.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
+SVGPropertyOwner* SVGAnimatedProperty::owner() const
 {
+    return m_contextElement;
 }
 
-SVGElement& SVGAttributeOwnerProxy::element() const
+void SVGAnimatedProperty::commitPropertyChange()
 {
-    return *m_element;
+    if (!m_contextElement)
+        return;
+    m_contextElement->commitPropertyChange(*this);
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
+
+#include "SVGPointerMemberAccessor.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
+template<typename OwnerType, typename AnimatedPropertyType>
+class SVGAnimatedPropertyAccessor : public SVGPointerMemberAccessor<OwnerType, AnimatedPropertyType> {
+    using Base = SVGPointerMemberAccessor<OwnerType, AnimatedPropertyType>;
 
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+public:
+    using Base::Base;
+    using Base::singleton;
+    using Base::property;
+    using AnimatedProperty = AnimatedPropertyType;
+
+    bool matches(const OwnerType& owner, const SVGAnimatedProperty& animatedProperty) const override
+    {
+        return property(owner).ptr() == &animatedProperty;
+    }
+
+private:
+    bool isAnimatedProperty() const override { return true; }
+};
 
 }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "SVGAnimatedPropertyAccessor.h"
+#include "SVGAnimatedPropertyAnimatorImpl.h"
+#include "SVGAnimatedPropertyImpl.h"
+#include "SVGNames.h"
 
 namespace WebCore {
 
-class SVGAttribute;
-class SVGElement;
-class SVGLegacyAnimatedProperty;
+template<typename OwnerType>
+class SVGAnimatedIntegerAccessor final : public SVGAnimatedPropertyAccessor<OwnerType, SVGAnimatedInteger> {
+    using Base = SVGAnimatedPropertyAccessor<OwnerType, SVGAnimatedInteger>;
 
-class SVGAttributeOwnerProxy {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    using Base::Base;
+    using Base::property;
+    template<Ref<SVGAnimatedInteger> OwnerType::*property>
+    constexpr static const SVGMemberAccessor<OwnerType>& singleton() { return Base::template singleton<SVGAnimatedIntegerAccessor, property>(); }
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+private:
+    std::unique_ptr<SVGAttributeAnimator> createAnimator(OwnerType& owner, const QualifiedName& attributeName, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive) const final
+    {
+        return SVGAnimatedIntegerAnimator::create(attributeName, property(owner), animationMode, calcMode, isAccumulated, isAdditive);
+    }
 
-    SVGElement& element() const;
-
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
-
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
-
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
-
-protected:
-    WeakPtr<SVGElement> m_element;
+    void appendAnimatedInstance(OwnerType& owner, SVGAttributeAnimator& animator) const final
+    {
+        static_cast<SVGAnimatedIntegerAnimator&>(animator).appendAnimatedInstance(property(owner));
+    }
 };
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "SVGAnimatedPropertyAnimator.h"
+#include "SVGAnimatedPropertyImpl.h"
+#include "SVGAnimationAdditiveValueFunctionImpl.h"
 
 namespace WebCore {
 
-class SVGAttribute;
-class SVGElement;
-class SVGLegacyAnimatedProperty;
+class SVGAnimatedIntegerPairAnimator;
 
-class SVGAttributeOwnerProxy {
+template<typename AnimatedPropertyAnimator1, typename AnimatedPropertyAnimator2>
+class SVGAnimatedPropertyPairAnimator;
+
+class SVGAnimatedIntegerAnimator final : public SVGAnimatedPropertyAnimator<SVGAnimatedInteger, SVGAnimationIntegerFunction> {
+    friend class SVGAnimatedPropertyPairAnimator<SVGAnimatedIntegerAnimator, SVGAnimatedIntegerAnimator>;
+    friend class SVGAnimatedIntegerPairAnimator;
+    using Base = SVGAnimatedPropertyAnimator<SVGAnimatedInteger, SVGAnimationIntegerFunction>;
+    using Base::Base;
+
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    static auto create(const QualifiedName& attributeName, Ref<SVGAnimatedInteger>& animated, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive)
+    {
+        return std::unique_ptr<SVGAnimatedIntegerAnimator>(new SVGAnimatedIntegerAnimator(attributeName, animated, animationMode, calcMode, isAccumulated, isAdditive));
+    }
 
-    virtual ~SVGAttributeOwnerProxy() = default;
-
-    SVGElement& element() const;
-
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
-
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
-
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
-
-protected:
-    WeakPtr<SVGElement> m_element;
+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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
+
+#include "SVGAnimatedAngle.h"
+#include "SVGAnimatedBoolean.h"
+#include "SVGAnimatedEnumeration.h"
+#include "SVGAnimatedLength.h"
+#include "SVGAnimatedLengthList.h"
+#include "SVGAnimatedNumber.h"
+#include "SVGAnimatedNumberList.h"
+#include "SVGAnimatedPointList.h"
+#include "SVGAnimatedPreserveAspectRatio.h"
+#include "SVGAnimatedPrimitiveProperty.h"
+#include "SVGAnimatedRect.h"
+#include "SVGAnimatedString.h"
+#include "SVGAnimatedTransformList.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
-
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+using SVGAnimatedInteger = SVGAnimatedPrimitiveProperty<int>;
 
 }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
+
+#include "SVGAnimationAdditiveFunction.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
+template<typename ValueType>
+class SVGAnimationAdditiveValueFunction : public SVGAnimationAdditiveFunction {
+public:
+    using SVGAnimationAdditiveFunction::SVGAnimationAdditiveFunction;
+    
+protected:
+    ValueType toAtEndOfDuration() const { return m_toAtEndOfDuration ? *m_toAtEndOfDuration : m_to; }
 
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+    ValueType m_from;
+    ValueType m_to;
+    Optional<ValueType> m_toAtEndOfDuration;
+};
 
 }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "SVGAnimationAdditiveValueFunction.h"
+#include "SVGPropertyTraits.h"
 
 namespace WebCore {
 
-class SVGAttribute;
-class SVGElement;
-class SVGLegacyAnimatedProperty;
+class SVGAnimationIntegerFunction : public SVGAnimationAdditiveValueFunction<int> {
+    friend class SVGAnimatedIntegerPairAnimator;
 
-class SVGAttributeOwnerProxy {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    using Base = SVGAnimationAdditiveValueFunction<int>;
+    using Base::Base;
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    void setFromAndToValues(SVGElement*, const String& from, const String& to) override
+    {
+        m_from = SVGPropertyTraits<int>::fromString(from);
+        m_to = SVGPropertyTraits<int>::fromString(to);
+    }
 
-    SVGElement& element() const;
+    void setToAtEndOfDurationValue(const String& toAtEndOfDuration) override
+    {
+        m_toAtEndOfDuration = SVGPropertyTraits<int>::fromString(toAtEndOfDuration);
+    }
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
+    void progress(SVGElement*, float percentage, unsigned repeatCount, int& animated)
+    {
+        animated = static_cast<int>(roundf(Base::progress(percentage, repeatCount, m_from, m_to, toAtEndOfDuration(), animated)));
+    }
 
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
+    float calculateDistance(SVGElement*, const String& from, const String& to) const override
+    {
+        return std::abs(to.toIntStrict() - from.toIntStrict());
+    }
 
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
-
-protected:
-    WeakPtr<SVGElement> m_element;
+private:
+    void addFromAndToValues(SVGElement*) override
+    {
+        m_to += m_from;
+    }
 };
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
+class SVGAnimationFunction {
+public:
+    virtual ~SVGAnimationFunction() = default;
 
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+    virtual bool isDiscrete() const { return false; }
+
+    virtual void setFromAndToValues(SVGElement* targetElement, const String&, const String&) = 0;
+    virtual void setFromAndByValues(SVGElement* targetElement, const String&, const String&) = 0;
+    virtual void setToAtEndOfDurationValue(const String&) = 0;
+
+    virtual float calculateDistance(SVGElement*, const String&, const String&) const { return -1; }
+protected:
+    SVGAnimationFunction(AnimationMode animationMode)
+        : m_animationMode(animationMode)
+    {
+    }
+
+    virtual void addFromAndToValues(SVGElement*) { }
+
+    AnimationMode m_animationMode;
+};
 
 }

trunk/Source/WebCore/svg/properties/SVGAttributeAnimator.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +25 @@
 
 #include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#include "SVGAttributeAnimator.h"
+
+#include "CSSComputedStyleDeclaration.h"
+#include "CSSPropertyParser.h"
+#include "SVGElement.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
+void SVGAttributeAnimator::applyAnimatedPropertyChange(SVGElement* element, const QualifiedName& attributeName)
 {
+    ASSERT(!element->m_deletionHasBegun);
+    element->svgAttributeChanged(attributeName);
 }
 
-SVGElement& SVGAttributeOwnerProxy::element() const
+void SVGAttributeAnimator::applyAnimatedPropertyChange(SVGElement* targetElement)
 {
-    return *m_element;
+    ASSERT(targetElement);
+    ASSERT(m_attributeName != anyQName());
+
+    // FIXME: Do we really need to check both isConnected and !parentNode?
+    if (!targetElement->isConnected() || !targetElement->parentNode())
+        return;
+
+    SVGElement::InstanceUpdateBlocker blocker(*targetElement);
+    applyAnimatedPropertyChange(targetElement, m_attributeName);
+
+    // If the target element has instances, update them as well, w/o requiring the <use> tree to be rebuilt.
+    for (auto* instance : targetElement->instances())
+        applyAnimatedPropertyChange(instance, m_attributeName);
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "CSSPropertyNames.h"
+#include "QualifiedName.h"
+#include <wtf/RefCounted.h>
+#include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
-class SVGAttribute;
 class SVGElement;
-class SVGLegacyAnimatedProperty;
 
-class SVGAttributeOwnerProxy {
+enum class AnimationMode : uint8_t {
+    None,
+    FromTo,
+    FromBy,
+    To,
+    By,
+    Values,
+    Path
+};
+
+enum class CalcMode : uint8_t {
+    Discrete,
+    Linear,
+    Paced,
+    Spline
+};
+
+class SVGAttributeAnimator {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    SVGAttributeAnimator(const QualifiedName& attributeName)
+        : m_attributeName(attributeName)
+    {
+    }
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    virtual ~SVGAttributeAnimator() = default;
 
-    SVGElement& element() const;
+    virtual bool isDiscrete() const { return false; }
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
+    virtual void setFromAndToValues(SVGElement*, const String&, const String&) { }
+    virtual void setFromAndByValues(SVGElement*, const String&, const String&) { }
+    virtual void setToAtEndOfDurationValue(const String&) { }
 
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
+    virtual void start(SVGElement*) = 0;
+    virtual void progress(SVGElement*, float, unsigned) = 0;
+    virtual void apply(SVGElement*) = 0;
+    virtual void stop(SVGElement* targetElement) = 0;
 
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
+    virtual float calculateDistance(SVGElement*, const String&, const String&) const { return -1; }
 
 protected:
-    WeakPtr<SVGElement> m_element;
+    static void applyAnimatedPropertyChange(SVGElement*, const QualifiedName&);
+
+    void applyAnimatedPropertyChange(SVGElement*);
+
+    const QualifiedName& m_attributeName;
 };
 

trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.cpp

@@ -27 +27 @@
 #include "SVGAttributeOwnerProxy.h"
 
+#include "SVGElement.h"
+
 namespace WebCore {
 

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

@@ -26 +26 @@
 #pragma once
 
+#include "QualifiedName.h"
 #include "SVGAnimatedPropertyType.h"
 #include <wtf/WeakPtr.h>

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

@@ -28 +28 @@
 #include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
-#include "SVGAnimatedInteger.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedLengthList.h"
@@ -81 +80 @@
     }
 
-    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGAnimatedIntegerAttribute OwnerType::*attribute>
-    void registerAttribute()
-    {
-        registerAttribute(SVGAnimatedIntegerAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
-    }
-
-    template<const LazyNeverDestroyed<const QualifiedName>& attributeName,
-        const AtomicString& (*identifier)(), SVGAnimatedIntegerAttribute OwnerType::*attribute,
-        const AtomicString& (*optionalIdentifier)(), SVGAnimatedIntegerAttribute OwnerType::*optionalAttribute>
-    void registerAttribute()
-    {
-        registerAttribute(SVGAnimatedOptionalIntegerAttributeAccessor<OwnerType>::template singleton<attributeName, identifier, attribute, optionalIdentifier, optionalAttribute>());
-    }
-
     template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGAnimatedLengthAttribute OwnerType::*attribute>
     void registerAttribute()

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "QualifiedName.h"
+#include "SVGAttributeAnimator.h"
 
 namespace WebCore {
 
-class SVGAttribute;
-class SVGElement;
-class SVGLegacyAnimatedProperty;
+class SVGAnimatedProperty;
 
-class SVGAttributeOwnerProxy {
+template<typename OwnerType>
+class SVGMemberAccessor {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    virtual ~SVGMemberAccessor() = default;
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    virtual void detach(const OwnerType&) const { }
+    virtual bool isAnimatedProperty() const { return false; }
+    virtual bool isAnimatedLength() const { return false; }
 
-    SVGElement& element() const;
+    virtual bool matches(const OwnerType&, const SVGAnimatedProperty&) const { return false; }
+    virtual Optional<String> synchronize(const OwnerType&) const { return WTF::nullopt; }
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
-
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
-
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
+    virtual std::unique_ptr<SVGAttributeAnimator> createAnimator(OwnerType&, const QualifiedName&, AnimationMode, CalcMode, bool, bool) const { return nullptr; }
+    virtual void appendAnimatedInstance(OwnerType&, SVGAttributeAnimator&) const { }
 
 protected:
-    WeakPtr<SVGElement> m_element;
+    SVGMemberAccessor() = default;
 };
 
-}
+} // namespace WebCore

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedPropertyType.h"
-#include <wtf/WeakPtr.h>
+#include "SVGMemberAccessor.h"
 
 namespace WebCore {
 
-class SVGAttribute;
-class SVGElement;
-class SVGLegacyAnimatedProperty;
+template<typename OwnerType, typename PropertyType>
+class SVGPointerMemberAccessor : public SVGMemberAccessor<OwnerType> {
+    using Base = SVGMemberAccessor<OwnerType>;
 
-class SVGAttributeOwnerProxy {
 public:
-    SVGAttributeOwnerProxy(SVGElement&);
+    SVGPointerMemberAccessor(Ref<PropertyType> OwnerType::*property)
+        : m_property(property)
+    {
+    }
 
-    virtual ~SVGAttributeOwnerProxy() = default;
+    Ref<PropertyType>& property(OwnerType& owner) const { return owner.*m_property; }
+    const Ref<PropertyType>& property(const OwnerType& owner) const { return owner.*m_property; }
 
-    SVGElement& element() const;
+    void detach(const OwnerType& owner) const override
+    {
+        property(owner)->detach();
+    }
 
-    virtual void synchronizeAttributes() const = 0;
-    virtual void synchronizeAttribute(const QualifiedName&) const = 0;
-
-    virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0;
-
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;
-    virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;
+    Optional<String> synchronize(const OwnerType& owner) const override
+    {
+        return property(owner)->synchronize();
+    }
 
 protected:
-    WeakPtr<SVGElement> m_element;
+    template<typename AccessorType, Ref<PropertyType> OwnerType::*property>
+    static const SVGMemberAccessor<OwnerType>& singleton()
+    {
+        static NeverDestroyed<AccessorType> propertyAccessor { property };
+        return propertyAccessor;
+    }
+
+    Ref<PropertyType> OwnerType::*m_property;
 };
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
+class SVGPropertyOwner {
+public:
+    virtual ~SVGPropertyOwner() = default;
 
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+    virtual SVGPropertyOwner* owner() const { return nullptr; }
+    
+    virtual const SVGElement* attributeContextElement() const
+    {
+        if (!owner())
+            return nullptr;
+        return owner()->attributeContextElement();
+    }
+    
+    virtual void commitPropertyChange()
+    {
+        if (!owner())
+            return;
+        owner()->commitPropertyChange();
+    }
+    
+protected:
+    SVGPropertyOwner() = default;
+};
 
 }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#include "config.h"
-#include "SVGAttributeOwnerProxy.h"
+#pragma once
+
+#include "SVGAttributeAnimator.h"
 
 namespace WebCore {
 
-SVGAttributeOwnerProxy::SVGAttributeOwnerProxy(SVGElement& element)
-    : m_element(makeWeakPtr(element))
-{
-}
+class SVGAnimatedProperty;
 
-SVGElement& SVGAttributeOwnerProxy::element() const
-{
-    return *m_element;
-}
+class SVGPropertyRegistry {
+public:
+    SVGPropertyRegistry() = default;
+    virtual ~SVGPropertyRegistry() = default;
+
+    virtual void detachAllProperties() const = 0;
+    virtual QualifiedName animatedPropertyAttributeName(const SVGAnimatedProperty&) const = 0;
+    virtual Optional<String> synchronize(const QualifiedName&) const = 0;
+    virtual HashMap<QualifiedName, String> synchronizeAllAttributes() const = 0;
+
+    virtual bool isAnimatedPropertyAttribute(const QualifiedName&) const = 0;
+    virtual std::unique_ptr<SVGAttributeAnimator> createAnimator(const QualifiedName&, AnimationMode, CalcMode, bool isAccumulated, bool isAdditive) const = 0;
+    virtual void appendAnimatedInstance(const QualifiedName& attributeName, SVGAttributeAnimator&) const = 0;
+};
 
 }