Changeset 243121 in webkit

Timestamp:

Mar 18, 2019, 5:39:41 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

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

-- SVGAnimatedBoolean will be defined as SVGAnimatedPrimitiveProperty<bool>.
-- SVGAnimatedBooleanAccessor is added to access a member of this type.
-- A function registerProperty() is added to SVGPropertyOwnerRegistry

to register this type.

-- SVGAnimatedBooleanAnimator is added to animate a member of this type.
-- SVGAnimationBooleanFunction is added to handle the progress of this

new type over a period of time.

SVGAnimationDiscreteFunction is the base class of SVGAnimationBooleanFunction.
It will be the base class of all the discrete animation function types:
string, bool, enum and PreserveAspectRatio types.

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• svg/SVGAnimationElement.h:
• svg/SVGAnimatorFactory.h:

(WebCore::SVGAnimatorFactory::create):

• svg/SVGClipPathElement.h:
• svg/SVGCursorElement.h:
• svg/SVGDefsElement.h:
• svg/SVGExternalResourcesRequired.cpp:

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

• svg/SVGExternalResourcesRequired.h:

(WebCore::SVGExternalResourcesRequired::externalResourcesRequired const):
(WebCore::SVGExternalResourcesRequired::externalResourcesRequiredAnimated):
(WebCore::SVGExternalResourcesRequired::setExternalResourcesRequired): Deleted.

• svg/SVGFEConvolveMatrixElement.cpp:

(WebCore::SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement):
(WebCore::SVGFEConvolveMatrixElement::registerAttributes):
(WebCore::SVGFEConvolveMatrixElement::parseAttribute):

• svg/SVGFEConvolveMatrixElement.h:
• svg/SVGFEImageElement.h:
• svg/SVGFontElement.h:
• svg/SVGForeignObjectElement.h:
• svg/SVGGElement.h:
• svg/SVGGradientElement.h:
• svg/SVGMPathElement.h:
• svg/SVGMarkerElement.h:
• svg/SVGMaskElement.h:
• svg/SVGPathElement.h:
• svg/SVGPatternElement.h:
• svg/SVGRectElement.h:
• svg/SVGSVGElement.h:
• svg/SVGScriptElement.h:
• svg/SVGSwitchElement.h:
• svg/SVGSymbolElement.h:
• svg/SVGTextContentElement.h:
• svg/SVGUseElement.h:
• svg/properties/SVGAnimatedPropertyAccessorImpl.h:
• svg/properties/SVGAnimatedPropertyAnimatorImpl.h:
• svg/properties/SVGAnimatedPropertyImpl.h:
• svg/properties/SVGAnimationDiscreteFunction.h: Added.

(WebCore::SVGAnimationDiscreteFunction::SVGAnimationDiscreteFunction):
(WebCore::SVGAnimationDiscreteFunction::progress):

• svg/properties/SVGAnimationDiscreteFunctionImpl.h: Added.
• svg/properties/SVGAttributeRegistry.h:
• svg/properties/SVGPropertyOwnerRegistry.h:

(WebCore::SVGPropertyOwnerRegistry::registerProperty):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• svg/SVGAnimationElement.h (modified) (1 diff)
• svg/SVGAnimatorFactory.h (modified) (2 diffs)
• svg/SVGClipPathElement.h (modified) (1 diff)
• svg/SVGCursorElement.h (modified) (1 diff)
• svg/SVGDefsElement.h (modified) (1 diff)
• svg/SVGExternalResourcesRequired.cpp (modified) (2 diffs)
• svg/SVGExternalResourcesRequired.h (modified) (2 diffs)
• svg/SVGFEConvolveMatrixElement.cpp (modified) (3 diffs)
• svg/SVGFEConvolveMatrixElement.h (modified) (5 diffs)
• svg/SVGFEImageElement.h (modified) (1 diff)
• svg/SVGFontElement.h (modified) (1 diff)
• svg/SVGForeignObjectElement.h (modified) (1 diff)
• svg/SVGGElement.h (modified) (1 diff)
• svg/SVGGradientElement.h (modified) (1 diff)
• svg/SVGMPathElement.h (modified) (1 diff)
• svg/SVGMarkerElement.h (modified) (1 diff)
• svg/SVGMaskElement.h (modified) (1 diff)
• svg/SVGPathElement.h (modified) (1 diff)
• svg/SVGPatternElement.h (modified) (1 diff)
• svg/SVGRectElement.h (modified) (1 diff)
• svg/SVGSVGElement.h (modified) (1 diff)
• svg/SVGScriptElement.h (modified) (1 diff)
• svg/SVGSwitchElement.h (modified) (1 diff)
• svg/SVGSymbolElement.h (modified) (1 diff)
• svg/SVGTextContentElement.h (modified) (1 diff)
• svg/SVGUseElement.h (modified) (1 diff)
• svg/properties/SVGAnimatedPropertyAccessorImpl.h (modified) (1 diff)
• svg/properties/SVGAnimatedPropertyAnimatorImpl.h (modified) (2 diffs)
• svg/properties/SVGAnimatedPropertyImpl.h (modified) (2 diffs)
• svg/properties/SVGAnimationDiscreteFunction.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyImpl.h ) (1 diff)
• svg/properties/SVGAnimationDiscreteFunctionImpl.h (copied) (copied from trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyImpl.h ) (2 diffs)
• svg/properties/SVGAttributeRegistry.h (modified) (2 diffs)
• svg/properties/SVGPropertyOwnerRegistry.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Remove the SVG property tear off objects for SVGAnimatedBoolean
+        https://bugs.webkit.org/show_bug.cgi?id=195862
+
+        Reviewed by Simon Fraser.
+
+        -- SVGAnimatedBoolean will be defined as SVGAnimatedPrimitiveProperty<bool>.
+        -- SVGAnimatedBooleanAccessor is added to access a member of this type.
+        -- A function registerProperty() is added to SVGPropertyOwnerRegistry
+           to register this type.
+        -- SVGAnimatedBooleanAnimator is added to animate a member of this type.
+        -- SVGAnimationBooleanFunction is added to handle the progress of this
+           new type over a period of time.
+
+        SVGAnimationDiscreteFunction is the base class of SVGAnimationBooleanFunction.
+        It will be the base class of all the discrete animation function types:
+        string, bool, enum and PreserveAspectRatio types.
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * svg/SVGAnimationElement.h:
+        * svg/SVGAnimatorFactory.h:
+        (WebCore::SVGAnimatorFactory::create):
+        * svg/SVGClipPathElement.h:
+        * svg/SVGCursorElement.h:
+        * svg/SVGDefsElement.h:
+        * svg/SVGExternalResourcesRequired.cpp:
+        (WebCore::SVGExternalResourcesRequired::SVGExternalResourcesRequired):
+        (WebCore::SVGExternalResourcesRequired::parseAttribute):
+        (WebCore::SVGExternalResourcesRequired::registerAttributes): Deleted.
+        * svg/SVGExternalResourcesRequired.h:
+        (WebCore::SVGExternalResourcesRequired::externalResourcesRequired const):
+        (WebCore::SVGExternalResourcesRequired::externalResourcesRequiredAnimated):
+        (WebCore::SVGExternalResourcesRequired::setExternalResourcesRequired): Deleted.
+        * svg/SVGFEConvolveMatrixElement.cpp:
+        (WebCore::SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement):
+        (WebCore::SVGFEConvolveMatrixElement::registerAttributes):
+        (WebCore::SVGFEConvolveMatrixElement::parseAttribute):
+        * svg/SVGFEConvolveMatrixElement.h:
+        * svg/SVGFEImageElement.h:
+        * svg/SVGFontElement.h:
+        * svg/SVGForeignObjectElement.h:
+        * svg/SVGGElement.h:
+        * svg/SVGGradientElement.h:
+        * svg/SVGMPathElement.h:
+        * svg/SVGMarkerElement.h:
+        * svg/SVGMaskElement.h:
+        * svg/SVGPathElement.h:
+        * svg/SVGPatternElement.h:
+        * svg/SVGRectElement.h:
+        * svg/SVGSVGElement.h:
+        * svg/SVGScriptElement.h:
+        * svg/SVGSwitchElement.h:
+        * svg/SVGSymbolElement.h:
+        * svg/SVGTextContentElement.h:
+        * svg/SVGUseElement.h:
+        * svg/properties/SVGAnimatedPropertyAccessorImpl.h:
+        * svg/properties/SVGAnimatedPropertyAnimatorImpl.h:
+        * svg/properties/SVGAnimatedPropertyImpl.h:
+        * svg/properties/SVGAnimationDiscreteFunction.h: Added.
+        (WebCore::SVGAnimationDiscreteFunction::SVGAnimationDiscreteFunction):
+        (WebCore::SVGAnimationDiscreteFunction::progress):
+        * svg/properties/SVGAnimationDiscreteFunctionImpl.h: Added.
+        * svg/properties/SVGAttributeRegistry.h:
+        * svg/properties/SVGPropertyOwnerRegistry.h:
+        (WebCore::SVGPropertyOwnerRegistry::registerProperty):
+
 2019-03-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Sources.txt

@@ -2271 +2271 @@
 svg/SVGAnimateTransformElement.cpp
 svg/SVGAnimatedAngle.cpp
-svg/SVGAnimatedBoolean.cpp
 svg/SVGAnimatedColor.cpp
 svg/SVGAnimatedEnumeration.cpp

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

@@ -259 +259 @@
                 0854B0231255E4E600B9CDD0 /* SVGRootInlineBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0111255E4E600B9CDD0 /* SVGRootInlineBox.h */; };
                 0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */; };
-                085797091278394C00A8EC5F /* SVGAnimatedBoolean.h in Headers */ = {isa = PBXBuildFile; fileRef = 085797081278394C00A8EC5F /* SVGAnimatedBoolean.h */; };
                 085A15931289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */; };
                 085B92BB0EFDE73D00E6123C /* FormDataBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 085B92B90EFDE73D00E6123C /* FormDataBuilder.h */; settings = {ATTRIBUTES = (); }; };
@@ -5630 +5629 @@
                 0854B0121255E4E600B9CDD0 /* SVGTextQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextQuery.cpp; sourceTree = "<group>"; };
                 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextQuery.h; sourceTree = "<group>"; };
-                085797081278394C00A8EC5F /* SVGAnimatedBoolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedBoolean.h; sourceTree = "<group>"; };
                 085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedTransformListPropertyTearOff.h; sourceTree = "<group>"; };
                 085B92B80EFDE73D00E6123C /* FormDataBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataBuilder.cpp; sourceTree = "<group>"; };
@@ -7582 +7580 @@
                 431A2FD613B7707A007791E4 /* SVGAnimatedLengthList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedLengthList.cpp; sourceTree = "<group>"; };
                 431A302013B89DCC007791E4 /* SVGAnimatedPreserveAspectRatio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedPreserveAspectRatio.cpp; sourceTree = "<group>"; };
-                431A308713B8F978007791E4 /* SVGAnimatedBoolean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedBoolean.cpp; sourceTree = "<group>"; };
                 432D3FE718A8658400D7DC03 /* SelectorCheckerTestFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorCheckerTestFunctions.h; sourceTree = "<group>"; };
                 4331AC7713B6870000A9E5AE /* SVGAnimatedNumberList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedNumberList.cpp; sourceTree = "<group>"; };
@@ -8682 +8679 @@
                 55D70D21223B00BB00044B8E /* SVGLegacyAnimatedProperty.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLegacyAnimatedProperty.cpp; sourceTree = "<group>"; };
                 55D70D22223B00EA00044B8E /* SVGLegacyProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLegacyProperty.h; sourceTree = "<group>"; };
+                55DCC51C2240605E00C26E32 /* SVGAnimationDiscreteFunctionImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimationDiscreteFunctionImpl.h; sourceTree = "<group>"; };
+                55DCC51D2240615500C26E32 /* SVGAnimationDiscreteFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimationDiscreteFunction.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>"; };
@@ -16231 +16230 @@
                                 55EE535E223B2A0E00FBA944 /* SVGAnimationAdditiveValueFunction.h */,
                                 55BE0259223B29C10032F08A /* SVGAnimationAdditiveValueFunctionImpl.h */,
+                                55DCC51D2240615500C26E32 /* SVGAnimationDiscreteFunction.h */,
+                                55DCC51C2240605E00C26E32 /* SVGAnimationDiscreteFunctionImpl.h */,
                                 55BE025B223B29C20032F08A /* SVGAnimationFunction.h */,
                                 55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */,
@@ -24113 +24114 @@
                                 087B84951272CEC700A14417 /* SVGAnimatedAngle.h */,
                                 B22277E60D00BF1F0071B782 /* SVGAnimatedAngle.idl */,
-                                431A308713B8F978007791E4 /* SVGAnimatedBoolean.cpp */,
-                                085797081278394C00A8EC5F /* SVGAnimatedBoolean.h */,
                                 B22277E70D00BF1F0071B782 /* SVGAnimatedBoolean.idl */,
                                 43A625F713B3304000AC94B8 /* SVGAnimatedColor.cpp */,
@@ -31911 +31910 @@
                                 B222797A0D00BF220071B782 /* SVGAnimateColorElement.h in Headers */,
                                 087B84961272CEC800A14417 /* SVGAnimatedAngle.h in Headers */,
-                                085797091278394C00A8EC5F /* SVGAnimatedBoolean.h in Headers */,
                                 43A625F813B3304000AC94B8 /* SVGAnimatedColor.h in Headers */,
                                 08D46CE3127AD5FC0089694B /* SVGAnimatedEnumeration.h in Headers */,

trunk/Source/WebCore/svg/SVGAnimationElement.h

@@ -25 +25 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGExternalResourcesRequired.h"
 #include "SVGSMILElement.h"

trunk/Source/WebCore/svg/SVGAnimatorFactory.h

@@ -21 +21 @@
 
 #include "SVGAnimatedAngle.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedColor.h"
 #include "SVGAnimatedEnumeration.h"
@@ -51 +50 @@
             return std::make_unique<SVGAnimatedAngleAnimator>(animationElement, contextElement);
         case AnimatedBoolean:
-            return std::make_unique<SVGAnimatedBooleanAnimator>(animationElement, contextElement);
+            return nullptr;
         case AnimatedColor:
             return std::make_unique<SVGAnimatedColorAnimator>(*animationElement, *contextElement);

trunk/Source/WebCore/svg/SVGClipPathElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGExternalResourcesRequired.h"

trunk/Source/WebCore/svg/SVGCursorElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedString.h"

trunk/Source/WebCore/svg/SVGDefsElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGExternalResourcesRequired.h"
 #include "SVGGraphicsElement.h"

trunk/Source/WebCore/svg/SVGExternalResourcesRequired.cpp

@@ -30 +30 @@
 SVGExternalResourcesRequired::SVGExternalResourcesRequired(SVGElement* contextElement)
     : m_contextElement(*contextElement)
+    , m_externalResourcesRequired(SVGAnimatedBoolean::create(contextElement))
 {
-    registerAttributes();
-}
-
-void SVGExternalResourcesRequired::registerAttributes()
-{
-    auto& registry = attributeRegistry();
-    if (!registry.isEmpty())
-        return;
-    registry.registerAttribute<SVGNames::externalResourcesRequiredAttr, &SVGEllipseElement::m_externalResourcesRequired>();
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        PropertyRegistry::registerProperty<SVGNames::externalResourcesRequiredAttr, &SVGExternalResourcesRequired::m_externalResourcesRequired>();
+    });
 }
 
@@ -45 +41 @@
 {
     if (name == SVGNames::externalResourcesRequiredAttr)
-        setExternalResourcesRequired(value == "true");
+        m_externalResourcesRequired->setBaseValInternal(value == "true");
 }
 

trunk/Source/WebCore/svg/SVGExternalResourcesRequired.h

@@ -51 +51 @@
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGExternalResourcesRequired>;
 
-    auto externalResourcesRequiredAnimated() { return m_externalResourcesRequired.animatedProperty(attributeOwnerProxy()); }
-
-    bool externalResourcesRequired() const { return m_externalResourcesRequired.value(); }
-    void setExternalResourcesRequired(bool externalResourcesRequired) { m_externalResourcesRequired.setValue(externalResourcesRequired); }
+    bool externalResourcesRequired() const { return m_externalResourcesRequired->currentValue(); }
+    SVGAnimatedBoolean& externalResourcesRequiredAnimated() { return m_externalResourcesRequired; }
 
 protected:
@@ -74 +72 @@
 
 private:
-    static void registerAttributes();
     AttributeOwnerProxy attributeOwnerProxy() { return { *this, m_contextElement }; }
     
     SVGElement& m_contextElement;
-    SVGAnimatedBooleanAttribute m_externalResourcesRequired;
+    Ref<SVGAnimatedBoolean> m_externalResourcesRequired;
 };
 

trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp

@@ -47 +47 @@
         PropertyRegistry::registerProperty<SVGNames::targetXAttr, &SVGFEConvolveMatrixElement::m_targetX>();
         PropertyRegistry::registerProperty<SVGNames::targetYAttr, &SVGFEConvolveMatrixElement::m_targetY>();
+        PropertyRegistry::registerProperty<SVGNames::preserveAlphaAttr, &SVGFEConvolveMatrixElement::m_preserveAlpha>();
     });
 }
@@ -80 +81 @@
         &SVGFEConvolveMatrixElement::kernelUnitLengthXIdentifier, &SVGFEConvolveMatrixElement::m_kernelUnitLengthX,
         &SVGFEConvolveMatrixElement::kernelUnitLengthYIdentifier, &SVGFEConvolveMatrixElement::m_kernelUnitLengthY>();
-    registry.registerAttribute<SVGNames::preserveAlphaAttr, &SVGFEConvolveMatrixElement::m_preserveAlpha>();
 }
 
@@ -153 +153 @@
     if (name == SVGNames::preserveAlphaAttr) {
         if (value == "true")
-            m_preserveAlpha.setValue(true);
+            m_preserveAlpha->setBaseValInternal(true);
         else if (value == "false")
-            m_preserveAlpha.setValue(false);
+            m_preserveAlpha->setBaseValInternal(false);
         else
             document().accessSVGExtensions().reportWarning("feConvolveMatrix: problem parsing preserveAlphaAttr=\"" + value  + "\". Filtered element will not be displayed.");

trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.h

@@ -79 +79 @@
     float kernelUnitLengthX() const { return m_kernelUnitLengthX.currentValue(attributeOwnerProxy()); }
     float kernelUnitLengthY() const { return m_kernelUnitLengthY.currentValue(attributeOwnerProxy()); }
-    bool preserveAlpha() const { return m_preserveAlpha.currentValue(attributeOwnerProxy()); }
+    bool preserveAlpha() const { return m_preserveAlpha->currentValue(); }
 
     RefPtr<SVGAnimatedString> in1Animated() { return m_in1.animatedProperty(attributeOwnerProxy()); }
@@ -92 +92 @@
     RefPtr<SVGAnimatedNumber> kernelUnitLengthXAnimated() { return m_kernelUnitLengthX.animatedProperty(attributeOwnerProxy()); }
     RefPtr<SVGAnimatedNumber> kernelUnitLengthYAnimated() { return m_kernelUnitLengthY.animatedProperty(attributeOwnerProxy()); }
-    RefPtr<SVGAnimatedBoolean> preserveAlphaAnimated() { return m_preserveAlpha.animatedProperty(attributeOwnerProxy()); }
+    SVGAnimatedBoolean& preserveAlphaAnimated() { return m_preserveAlpha; }
 
 private:
@@ -100 +100 @@
     static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
     static void registerAttributes();
-    
+    const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
+
     using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEConvolveMatrixElement, SVGFilterPrimitiveStandardAttributes>;
     const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; }
@@ -109 +110 @@
     }
 
-    const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
     void parseAttribute(const QualifiedName&, const AtomicString&) override;
     void svgAttributeChanged(const QualifiedName&) override;
@@ -132 +132 @@
     SVGAnimatedNumberAttribute m_kernelUnitLengthX;
     SVGAnimatedNumberAttribute m_kernelUnitLengthY;
-    SVGAnimatedBooleanAttribute m_preserveAlpha;
+    Ref<SVGAnimatedBoolean> m_preserveAlpha { SVGAnimatedBoolean::create(this) };
 };
 

trunk/Source/WebCore/svg/SVGFEImageElement.h

@@ -24 +24 @@
 #include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGExternalResourcesRequired.h"

trunk/Source/WebCore/svg/SVGFontElement.h

@@ -25 +25 @@
 #if ENABLE(SVG_FONTS)
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGElement.h"
 #include "SVGExternalResourcesRequired.h"

trunk/Source/WebCore/svg/SVGForeignObjectElement.h

@@ -20 +20 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGExternalResourcesRequired.h"

trunk/Source/WebCore/svg/SVGGElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGExternalResourcesRequired.h"
 #include "SVGGraphicsElement.h"

trunk/Source/WebCore/svg/SVGGradientElement.h

@@ -23 +23 @@
 
 #include "Gradient.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedTransformList.h"

trunk/Source/WebCore/svg/SVGMPathElement.h

@@ -21 +21 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedString.h"
 #include "SVGElement.h"

trunk/Source/WebCore/svg/SVGMarkerElement.h

@@ -23 +23 @@
 
 #include "SVGAnimatedAngle.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"

trunk/Source/WebCore/svg/SVGMaskElement.h

@@ -21 +21 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"

trunk/Source/WebCore/svg/SVGPathElement.h

@@ -23 +23 @@
 
 #include "Path.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedNumber.h"
 #include "SVGAnimatedPath.h"

trunk/Source/WebCore/svg/SVGPatternElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"

trunk/Source/WebCore/svg/SVGRectElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGExternalResourcesRequired.h"

trunk/Source/WebCore/svg/SVGSVGElement.h

@@ -23 +23 @@
 
 #include "FloatPoint.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedPreserveAspectRatio.h"

trunk/Source/WebCore/svg/SVGScriptElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedString.h"
 #include "SVGElement.h"

trunk/Source/WebCore/svg/SVGSwitchElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGExternalResourcesRequired.h"
 #include "SVGGraphicsElement.h"

trunk/Source/WebCore/svg/SVGSymbolElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGAnimatedRect.h"

trunk/Source/WebCore/svg/SVGTextContentElement.h

@@ -22 +22 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"

trunk/Source/WebCore/svg/SVGUseElement.h

@@ -24 +24 @@
 #include "CachedResourceHandle.h"
 #include "CachedSVGDocumentClient.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGExternalResourcesRequired.h"

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

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

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

@@ -29 +29 @@
 #include "SVGAnimatedPropertyImpl.h"
 #include "SVGAnimationAdditiveValueFunctionImpl.h"
+#include "SVGAnimationDiscreteFunctionImpl.h"
 
 namespace WebCore {
@@ -36 +37 @@
 template<typename AnimatedPropertyAnimator1, typename AnimatedPropertyAnimator2>
 class SVGAnimatedPropertyPairAnimator;
+
+class SVGAnimatedBooleanAnimator final : public SVGAnimatedPropertyAnimator<SVGAnimatedBoolean, SVGAnimationBooleanFunction>  {
+    using Base = SVGAnimatedPropertyAnimator<SVGAnimatedBoolean, SVGAnimationBooleanFunction>;
+    using Base::Base;
+
+public:
+    static auto create(const QualifiedName& attributeName, Ref<SVGAnimatedBoolean>& animated, AnimationMode animationMode, CalcMode calcMode, bool isAccumulated, bool isAdditive)
+    {
+        return std::unique_ptr<SVGAnimatedBooleanAnimator>(new SVGAnimatedBooleanAnimator(attributeName, animated, animationMode, calcMode, isAccumulated, isAdditive));
+    }
+
+private:
+    void progress(SVGElement* targetElement, float percentage, unsigned repeatCount) final
+    {
+        bool& animated = m_animated->animVal();
+        m_function.progress(targetElement, percentage, repeatCount, animated);
+    }
+};
 
 class SVGAnimatedIntegerAnimator final : public SVGAnimatedPropertyAnimator<SVGAnimatedInteger, SVGAnimationIntegerFunction> {

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

@@ -27 +27 @@
 
 #include "SVGAnimatedAngle.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
@@ -42 +41 @@
 namespace WebCore {
 
+using SVGAnimatedBoolean = SVGAnimatedPrimitiveProperty<bool>;
 using SVGAnimatedInteger = SVGAnimatedPrimitiveProperty<int>;
 

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

@@ -26 +26 @@
 #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 {
 
-using SVGAnimatedInteger = SVGAnimatedPrimitiveProperty<int>;
+template<typename ValueType>
+class SVGAnimationDiscreteFunction : public SVGAnimationFunction {
+public:
+    SVGAnimationDiscreteFunction(AnimationMode animationMode, CalcMode, bool, bool)
+        : SVGAnimationFunction(animationMode)
+    {
+    }
+
+    bool isDiscrete() const override { return true; }
+
+    void setToAtEndOfDurationValue(const String&) override
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    void setFromAndByValues(SVGElement*, const String&, const String&) override
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    void progress(SVGElement*, float percentage, unsigned, ValueType& animated)
+    {
+        if ((m_animationMode == AnimationMode::FromTo && percentage > 0.5) || m_animationMode == AnimationMode::To || percentage == 1)
+            animated = m_to;
+        else
+            animated = m_from;
+    }
+
+protected:
+    ValueType m_from;
+    ValueType m_to;
+};
 
 }

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018-2019 Apple Inc.  All rights reserved.
+ * Copyright (C) 2019 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #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"
+#include "SVGAnimationDiscreteFunction.h"
+#include "SVGPropertyTraits.h"
 
 namespace WebCore {
 
-using SVGAnimatedInteger = SVGAnimatedPrimitiveProperty<int>;
+class SVGAnimationBooleanFunction : public SVGAnimationDiscreteFunction<bool> {
+public:
+    using Base = SVGAnimationDiscreteFunction<bool>;
+    using Base::Base;
+
+    void setFromAndToValues(SVGElement*, const String& from, const String& to) override
+    {
+        m_from = SVGPropertyTraits<bool>::fromString(from);
+        m_to = SVGPropertyTraits<bool>::fromString(to);
+    }
+};
 
 }

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

@@ -26 +26 @@
 #pragma once
 
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
@@ -68 +67 @@
 
     // Animatable attributes
-    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGAnimatedBooleanAttribute OwnerType::*attribute>
-    void registerAttribute()
-    {
-        registerAttribute(SVGAnimatedBooleanAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
-    }
-
     template<const LazyNeverDestroyed<const QualifiedName>& attributeName, typename EnumType, SVGAnimatedEnumerationAttribute<EnumType> OwnerType::*attribute>
     void registerAttribute()

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

@@ -43 +43 @@
     }
 
+    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGAnimatedBoolean> OwnerType::*property>
+    static void registerProperty()
+    {
+        registerProperty(attributeName, SVGAnimatedBooleanAccessor<OwnerType>::template singleton<property>());
+    }
+
     template<const LazyNeverDestroyed<const QualifiedName>& attributeName, Ref<SVGAnimatedInteger> OwnerType::*property>
     static void registerProperty()