Changeset 251809 in webkit

Timestamp:

Oct 30, 2019 3:15:17 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove the argument 'resultElement' from the SVG animation functions
​https://bugs.webkit.org/show_bug.cgi?id=202052

Reviewed by Simon Fraser.

This is a clean-up patch, which does the following:

-- It removes the argument 'resultElement' from all the SVG animation

functions except from SVGSMILElement::progress(). In this function, we
need to start the animation only with the first animation.

-- It renames resetAnimatedType() and clearAnimatedType() to startAnimation()

and stopAnimation() respectively. These functions were named for the
type SVGAnimatedType which had been deleted. The real purpose of these
functions is to start/stop the animation.

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-10-30

• svg/SVGAnimateElementBase.cpp:

(WebCore::SVGAnimateElementBase::startAnimation):
(WebCore::SVGAnimateElementBase::calculateAnimatedValue):
(WebCore::SVGAnimateElementBase::stopAnimation):
(WebCore::SVGAnimateElementBase::resetAnimatedType): Deleted.
(WebCore::SVGAnimateElementBase::clearAnimatedType): Deleted.

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

(WebCore::SVGAnimateMotionElement::startAnimation):
(WebCore::SVGAnimateMotionElement::stopAnimation):
(WebCore::SVGAnimateMotionElement::calculateAnimatedValue):
(WebCore::SVGAnimateMotionElement::resetAnimatedType): Deleted.
(WebCore::SVGAnimateMotionElement::clearAnimatedType): Deleted.

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

(WebCore::SVGAnimationElement::updateAnimation):

• svg/SVGAnimationElement.h:
• svg/animation/SMILTimeContainer.cpp:

(WebCore::SMILTimeContainer::updateAnimations):

• svg/animation/SVGSMILElement.cpp:

(WebCore::SVGSMILElement::reset):
(WebCore::SVGSMILElement::setAttributeName):
(WebCore::SVGSMILElement::setTargetElement):
(WebCore::SVGSMILElement::progress):

• svg/animation/SVGSMILElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGAnimateElementBase.cpp (modified) (3 diffs)
• svg/SVGAnimateElementBase.h (modified) (1 diff)
• svg/SVGAnimateMotionElement.cpp (modified) (3 diffs)
• svg/SVGAnimateMotionElement.h (modified) (1 diff)
• svg/SVGAnimationElement.cpp (modified) (2 diffs)
• svg/SVGAnimationElement.h (modified) (2 diffs)
• svg/animation/SMILTimeContainer.cpp (modified) (1 diff)
• svg/animation/SVGSMILElement.cpp (modified) (7 diffs)
• svg/animation/SVGSMILElement.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Remove the argument 'resultElement' from the SVG animation functions
+        https://bugs.webkit.org/show_bug.cgi?id=202052
+
+         Reviewed by Simon Fraser.
+
+         This is a clean-up patch, which does the following:
+
+         -- It removes the argument 'resultElement' from all the SVG animation
+           functions except from SVGSMILElement::progress(). In this function, we
+           need to start the animation only with the first animation.
+
+         -- It renames resetAnimatedType() and clearAnimatedType() to startAnimation()
+           and stopAnimation() respectively. These functions were named for the
+           type SVGAnimatedType which had been deleted. The real purpose of these
+           functions is to start/stop the animation.
+
+        * svg/SVGAnimateElementBase.cpp:
+        (WebCore::SVGAnimateElementBase::startAnimation):
+        (WebCore::SVGAnimateElementBase::calculateAnimatedValue):
+        (WebCore::SVGAnimateElementBase::stopAnimation):
+        (WebCore::SVGAnimateElementBase::resetAnimatedType): Deleted.
+        (WebCore::SVGAnimateElementBase::clearAnimatedType): Deleted.
+        * svg/SVGAnimateElementBase.h:
+        * svg/SVGAnimateMotionElement.cpp:
+        (WebCore::SVGAnimateMotionElement::startAnimation):
+        (WebCore::SVGAnimateMotionElement::stopAnimation):
+        (WebCore::SVGAnimateMotionElement::calculateAnimatedValue):
+        (WebCore::SVGAnimateMotionElement::resetAnimatedType): Deleted.
+        (WebCore::SVGAnimateMotionElement::clearAnimatedType): Deleted.
+        * svg/SVGAnimateMotionElement.h:
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::updateAnimation):
+        * svg/SVGAnimationElement.h:
+        * svg/animation/SMILTimeContainer.cpp:
+        (WebCore::SMILTimeContainer::updateAnimations):
+        * svg/animation/SVGSMILElement.cpp:
+        (WebCore::SVGSMILElement::reset):
+        (WebCore::SVGSMILElement::setAttributeName):
+        (WebCore::SVGSMILElement::setTargetElement):
+        (WebCore::SVGSMILElement::progress):
+        * svg/animation/SVGSMILElement.h:
+
 2019-10-30  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp

@@ -147 +147 @@
 }
 
-void SVGAnimateElementBase::resetAnimatedType()
+void SVGAnimateElementBase::startAnimation()
 {
     if (!targetElement())
@@ -156 +156 @@
 }
 
-void SVGAnimateElementBase::calculateAnimatedValue(float progress, unsigned repeatCount, SVGSMILElement*)
+void SVGAnimateElementBase::calculateAnimatedValue(float progress, unsigned repeatCount)
 {
     if (!targetElement())
@@ -181 +181 @@
 }
 
-void SVGAnimateElementBase::clearAnimatedType(SVGElement* targetElement)
+void SVGAnimateElementBase::stopAnimation(SVGElement* targetElement)
 {
     if (!targetElement)

trunk/Source/WebCore/svg/SVGAnimateElementBase.h

@@ -54 +54 @@
     bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) override;
 
-    void resetAnimatedType() override;
-    void calculateAnimatedValue(float progress, unsigned repeatCount, SVGSMILElement* resultElement) override;
+    void startAnimation() override;
+    void calculateAnimatedValue(float progress, unsigned repeatCount) override;
     void applyResultsToTarget() override;
-    void clearAnimatedType(SVGElement* targetElement) override;
+    void stopAnimation(SVGElement* targetElement) override;
     Optional<float> calculateDistance(const String& fromString, const String& toString) override;
 

trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp

@@ -140 +140 @@
 }
 
-void SVGAnimateMotionElement::resetAnimatedType()
+void SVGAnimateMotionElement::startAnimation()
 {
     if (!hasValidAttributeType())
@@ -151 +151 @@
 }
 
-void SVGAnimateMotionElement::clearAnimatedType(SVGElement* targetElement)
+void SVGAnimateMotionElement::stopAnimation(SVGElement* targetElement)
 {
     if (!targetElement)
@@ -209 +209 @@
 }
 
-void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement*)
+void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned repeatCount)
 {
     auto targetElement = makeRefPtr(this->targetElement());

trunk/Source/WebCore/svg/SVGAnimateMotionElement.h

@@ -42 +42 @@
     void parseAttribute(const QualifiedName&, const AtomString&) override;
 
-    void resetAnimatedType() override;
-    void clearAnimatedType(SVGElement* targetElement) override;
+    void startAnimation() override;
+    void stopAnimation(SVGElement* targetElement) override;
     bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) override;
     bool calculateFromAndToValues(const String& fromString, const String& toString) override;
     bool calculateFromAndByValues(const String& fromString, const String& byString) override;
-    void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement) override;
+    void calculateAnimatedValue(float percentage, unsigned repeatCount) override;
     void applyResultsToTarget() override;
     Optional<float> calculateDistance(const String& fromString, const String& toString) override;

trunk/Source/WebCore/svg/SVGAnimationElement.cpp

@@ -563 +563 @@
 }
 
-void SVGAnimationElement::updateAnimation(float percent, unsigned repeatCount, SVGSMILElement* resultElement)
+void SVGAnimationElement::updateAnimation(float percent, unsigned repeatCount)
 {    
     if (!m_animationValid)
@@ -591 +591 @@
         effectivePercent = percent;
 
-    calculateAnimatedValue(effectivePercent, repeatCount, resultElement);
+    calculateAnimatedValue(effectivePercent, repeatCount);
 }
 

trunk/Source/WebCore/svg/SVGAnimationElement.h

@@ -103 +103 @@
     // from SVGSMILElement
     void startedActiveInterval() override;
-    void updateAnimation(float percent, unsigned repeat, SVGSMILElement* resultElement) override;
+    void updateAnimation(float percent, unsigned repeat) override;
 
     AnimatedPropertyValueType m_fromPropertyValueType { RegularPropertyValue };
@@ -121 +121 @@
     virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0;
     virtual bool calculateFromAndByValues(const String& fromString, const String& byString) = 0;
-    virtual void calculateAnimatedValue(float percent, unsigned repeatCount, SVGSMILElement* resultElement) = 0;
+    virtual void calculateAnimatedValue(float percent, unsigned repeatCount) = 0;
     virtual Optional<float> calculateDistance(const String& /*fromString*/, const String& /*toString*/) = 0;
 

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

@@ -279 +279 @@
 
             // This will calculate the contribution from the animation and add it to the resultsElement.
-            if (!animation->progress(elapsed, firstAnimation.get(), seekToTime) && firstAnimation == animation)
+            if (!animation->progress(elapsed, *firstAnimation, seekToTime) && firstAnimation == animation)
                 firstAnimation = nullptr;
 

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

@@ -246 +246 @@
 void SVGSMILElement::reset()
 {
-    clearAnimatedType(m_targetElement);
+    stopAnimation(m_targetElement);
 
     m_activeState = Inactive;
@@ -611 +611 @@
     // Only clear the animated type, if we had a target before.
     if (m_targetElement)
-        clearAnimatedType(m_targetElement);
+        stopAnimation(m_targetElement);
 }
 
@@ -625 +625 @@
     if (m_targetElement) {
         // Clear values that may depend on the previous target.
-        clearAnimatedType(m_targetElement);
+        stopAnimation(m_targetElement);
         disconnectConditions();
     }
@@ -1071 +1071 @@
 }
     
-bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement* resultElement, bool seekToTime)
-{
-    ASSERT(resultElement);
+bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement& firstAnimation, bool seekToTime)
+{
     ASSERT(m_timeContainer);
     ASSERT(m_isWaitingForFirstInterval || m_intervalBegin.isFinite());
@@ -1086 +1085 @@
         ASSERT(m_activeState != Active);
         if (m_activeState == Frozen) {
-            if (this == resultElement)
-                resetAnimatedType();
-            updateAnimation(m_lastPercent, m_lastRepeat, resultElement);
+            if (this == &firstAnimation)
+                startAnimation();
+            updateAnimation(m_lastPercent, m_lastRepeat);
         }
         m_nextProgressTime = m_intervalBegin;
@@ -1119 +1118 @@
     bool animationIsContributing = isContributing(elapsed);
 
-    // Only reset the animated type to the base value once for the lowest priority animation that animates and contributes to a particular element/attribute pair.
-    if (this == resultElement && animationIsContributing)
-        resetAnimatedType();
-
     if (animationIsContributing) {
+        // Only start the animation of the lowest priority animation that animates and contributes to a particular element/attribute pair.
+        if (this == &firstAnimation)
+            startAnimation();
+
         if (oldActiveState == Inactive)
             startedActiveInterval();
 
-        updateAnimation(percent, repeat, resultElement);
+        updateAnimation(percent, repeat);
         m_lastPercent = percent;
         m_lastRepeat = repeat;
@@ -1136 +1135 @@
         endedActiveInterval();
         if (m_activeState != Frozen)
-            clearAnimatedType(m_targetElement);
+            stopAnimation(m_targetElement);
     } else if (oldActiveState != Active && m_activeState == Active)
         smilBeginEventSender().dispatchEventSoon(*this);

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

@@ -83 +83 @@
 
     void seekToIntervalCorrespondingToTime(SMILTime elapsed);
-    bool progress(SMILTime elapsed, SVGSMILElement* resultsElement, bool seekToTime);
+    bool progress(SMILTime elapsed, SVGSMILElement& firstAnimation, bool seekToTime);
     SMILTime nextProgressTime() const;
 
@@ -99 +99 @@
 
     virtual bool isAdditive() const = 0;
-    virtual void resetAnimatedType() = 0;
-    virtual void clearAnimatedType(SVGElement* targetElement) = 0;
+    virtual void startAnimation() = 0;
+    virtual void stopAnimation(SVGElement* targetElement) = 0;
     virtual void applyResultsToTarget() = 0;
 
@@ -130 +130 @@
     virtual void startedActiveInterval() = 0;
     void endedActiveInterval();
-    virtual void updateAnimation(float percent, unsigned repeat, SVGSMILElement* resultElement) = 0;
+    virtual void updateAnimation(float percent, unsigned repeat) = 0;
 
     static bool isSupportedAttribute(const QualifiedName&);