Changeset 268808 in webkit

Timestamp:

Oct 21, 2020, 11:09:02 AM (6 years ago)

Author:

graouts@webkit.org

Message:

Rename hasRunningTransitionsForProperty() and hasCompletedTransitionsForProperty() to be singular
​https://bugs.webkit.org/show_bug.cgi?id=218014

Reviewed by Geoffrey Garen.

Since there is only running or completed transition per property, the name of these methods was misleading.

• animation/AnimationTimeline.cpp:

(WebCore::AnimationTimeline::updateCSSTransitionsForStyleableAndProperty):

• dom/Element.cpp:

(WebCore::Element::hasCompletedTransitionForProperty const):
(WebCore::Element::hasRunningTransitionForProperty const):
(WebCore::Element::hasCompletedTransitionsForProperty const): Deleted.
(WebCore::Element::hasRunningTransitionsForProperty const): Deleted.

• dom/Element.h:
• style/Styleable.h:

(WebCore::Styleable::hasCompletedTransitionForProperty const):
(WebCore::Styleable::hasRunningTransitionForProperty const):
(WebCore::Styleable::hasCompletedTransitionsForProperty const): Deleted.
(WebCore::Styleable::hasRunningTransitionsForProperty const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/AnimationTimeline.cpp (modified) (5 diffs)
• dom/Element.cpp (modified) (2 diffs)
• dom/Element.h (modified) (1 diff)
• style/Styleable.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Antoine Quint  <graouts@webkit.org>
+
+        Rename hasRunningTransitionsForProperty() and hasCompletedTransitionsForProperty() to be singular
+        https://bugs.webkit.org/show_bug.cgi?id=218014
+
+        Reviewed by Geoffrey Garen.
+
+        Since there is only running or completed transition per property, the name of these methods was misleading.
+
+        * animation/AnimationTimeline.cpp:
+        (WebCore::AnimationTimeline::updateCSSTransitionsForStyleableAndProperty):
+        * dom/Element.cpp:
+        (WebCore::Element::hasCompletedTransitionForProperty const):
+        (WebCore::Element::hasRunningTransitionForProperty const):
+        (WebCore::Element::hasCompletedTransitionsForProperty const): Deleted.
+        (WebCore::Element::hasRunningTransitionsForProperty const): Deleted.
+        * dom/Element.h:
+        * style/Styleable.h:
+        (WebCore::Styleable::hasCompletedTransitionForProperty const):
+        (WebCore::Styleable::hasRunningTransitionForProperty const):
+        (WebCore::Styleable::hasCompletedTransitionsForProperty const): Deleted.
+        (WebCore::Styleable::hasRunningTransitionsForProperty const): Deleted.
+
 2020-10-21  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/animation/AnimationTimeline.cpp

@@ -364 +364 @@
     // A CSS Transition might have completed since the last time animations were updated so we must
     // update the running and completed transitions membership in that case.
-    if (is<CSSTransition>(animation) && matchingBackingAnimation && styleable.hasRunningTransitionsForProperty(property) && animation->playState() == WebAnimation::PlayState::Finished) {
+    if (is<CSSTransition>(animation) && matchingBackingAnimation && styleable.hasRunningTransitionForProperty(property) && animation->playState() == WebAnimation::PlayState::Finished) {
         styleable.ensureCompletedTransitionsByProperty().set(property, styleable.ensureRunningTransitionsByProperty().take(property));
         animation = nullptr;
@@ -405 +405 @@
     }();
 
-    if (!styleable.hasRunningTransitionsForProperty(property)
+    if (!styleable.hasRunningTransitionForProperty(property)
         && !CSSPropertyAnimation::propertiesEqual(property, &beforeChangeStyle, &afterChangeStyle)
         && CSSPropertyAnimation::canPropertyBeInterpolated(property, &beforeChangeStyle, &afterChangeStyle)
@@ -432 +432 @@
         auto reversingShorteningFactor = 1;
         styleable.ensureRunningTransitionsByProperty().set(property, CSSTransition::create(styleable, property, generationTime, *matchingBackingAnimation, &beforeChangeStyle, afterChangeStyle, delay, duration, reversingAdjustedStartStyle, reversingShorteningFactor));
-    } else if (styleable.hasCompletedTransitionsForProperty(property) && !propertyInStyleMatchesValueForTransitionInMap(property, afterChangeStyle, styleable.ensureCompletedTransitionsByProperty())) {
+    } else if (styleable.hasCompletedTransitionForProperty(property) && !propertyInStyleMatchesValueForTransitionInMap(property, afterChangeStyle, styleable.ensureCompletedTransitionsByProperty())) {
         // 2. Otherwise, if the element has a completed transition for the property and the end value of the completed transition is different from
         //    the after-change style for the property, then implementations must remove the completed transition from the set of completed transitions.
@@ -438 +438 @@
     }
 
-    bool hasRunningTransition = styleable.hasRunningTransitionsForProperty(property);
-    if ((hasRunningTransition || styleable.hasCompletedTransitionsForProperty(property)) && !matchingBackingAnimation) {
+    bool hasRunningTransition = styleable.hasRunningTransitionForProperty(property);
+    if ((hasRunningTransition || styleable.hasCompletedTransitionForProperty(property)) && !matchingBackingAnimation) {
         // 3. If the element has a running transition or completed transition for the property, and there is not a matching transition-property
         //    value, then implementations must cancel the running transition or remove the completed transition from the set of completed transitions.
@@ -448 +448 @@
     }
 
-    if (matchingBackingAnimation && styleable.hasRunningTransitionsForProperty(property) && !propertyInStyleMatchesValueForTransitionInMap(property, afterChangeStyle, styleable.ensureRunningTransitionsByProperty())) {
+    if (matchingBackingAnimation && styleable.hasRunningTransitionForProperty(property) && !propertyInStyleMatchesValueForTransitionInMap(property, afterChangeStyle, styleable.ensureRunningTransitionsByProperty())) {
         auto previouslyRunningTransition = styleable.ensureRunningTransitionsByProperty().take(property);
         auto& previouslyRunningTransitionCurrentStyle = previouslyRunningTransition->currentStyle();

trunk/Source/WebCore/dom/Element.cpp

@@ -3848 +3848 @@
 }
 
-bool Element::hasCompletedTransitionsForProperty(PseudoId pseudoId, CSSPropertyID property) const
+bool Element::hasCompletedTransitionForProperty(PseudoId pseudoId, CSSPropertyID property) const
 {
     if (auto* animationData = animationRareData(pseudoId))
@@ -3855 +3855 @@
 }
 
-bool Element::hasRunningTransitionsForProperty(PseudoId pseudoId, CSSPropertyID property) const
+bool Element::hasRunningTransitionForProperty(PseudoId pseudoId, CSSPropertyID property) const
 {
     if (auto* animationData = animationRareData(pseudoId))

trunk/Source/WebCore/dom/Element.h

@@ -493 +493 @@
 
     const AnimationCollection* animations(PseudoId) const;
-    bool hasCompletedTransitionsForProperty(PseudoId, CSSPropertyID) const;
-    bool hasRunningTransitionsForProperty(PseudoId, CSSPropertyID) const;
+    bool hasCompletedTransitionForProperty(PseudoId, CSSPropertyID) const;
+    bool hasRunningTransitionForProperty(PseudoId, CSSPropertyID) const;
     bool hasRunningTransitions(PseudoId) const;
     AnimationCollection& ensureAnimations(PseudoId);

trunk/Source/WebCore/style/Styleable.h

@@ -97 +97 @@
     }
 
-    bool hasCompletedTransitionsForProperty(CSSPropertyID property) const
+    bool hasCompletedTransitionForProperty(CSSPropertyID property) const
     {
-        return element.hasCompletedTransitionsForProperty(pseudoId, property);
+        return element.hasCompletedTransitionForProperty(pseudoId, property);
     }
 
-    bool hasRunningTransitionsForProperty(CSSPropertyID property) const
+    bool hasRunningTransitionForProperty(CSSPropertyID property) const
     {
-        return element.hasRunningTransitionsForProperty(pseudoId, property);
+        return element.hasRunningTransitionForProperty(pseudoId, property);
     }