Changeset 258827 in webkit

Timestamp:

Mar 23, 2020 2:05:26 AM (4 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Fix the typo for ElementAnimationRareData::completedTransitionByProperty()
​https://bugs.webkit.org/show_bug.cgi?id=209413

Reviewed by Antti Koivisto.

There can be several completed transitions by property, so renaming this property to completedTransitionsByProperty.

• animation/AnimationTimeline.cpp:

(WebCore::AnimationTimeline::removeDeclarativeAnimationFromListsForOwningElement):
(WebCore::AnimationTimeline::updateCSSTransitionsForElement):

• animation/DocumentTimeline.cpp:

(WebCore::DocumentTimeline::transitionDidComplete):

• animation/ElementAnimationRareData.h:

(WebCore::ElementAnimationRareData::completedTransitionsByProperty):
(WebCore::ElementAnimationRareData::completedTransitionByProperty): Deleted.

• dom/Element.cpp:

(WebCore::Element::completedTransitionsByProperty):
(WebCore::Element::completedTransitionByProperty): Deleted.

• dom/Element.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/AnimationTimeline.cpp (modified) (2 diffs)
• animation/DocumentTimeline.cpp (modified) (1 diff)
• animation/ElementAnimationRareData.h (modified) (2 diffs)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-23  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Fix the typo for ElementAnimationRareData::completedTransitionByProperty()
+        https://bugs.webkit.org/show_bug.cgi?id=209413
+
+        Reviewed by Antti Koivisto.
+
+        There can be several completed transitions by property, so renaming this property to completedTransitionsByProperty.
+
+        * animation/AnimationTimeline.cpp:
+        (WebCore::AnimationTimeline::removeDeclarativeAnimationFromListsForOwningElement):
+        (WebCore::AnimationTimeline::updateCSSTransitionsForElement):
+        * animation/DocumentTimeline.cpp:
+        (WebCore::DocumentTimeline::transitionDidComplete):
+        * animation/ElementAnimationRareData.h:
+        (WebCore::ElementAnimationRareData::completedTransitionsByProperty):
+        (WebCore::ElementAnimationRareData::completedTransitionByProperty): Deleted.
+        * dom/Element.cpp:
+        (WebCore::Element::completedTransitionsByProperty):
+        (WebCore::Element::completedTransitionByProperty): Deleted.
+        * dom/Element.h:
+
 2020-03-22  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/animation/AnimationTimeline.cpp

@@ -141 +141 @@
         auto& transition = downcast<CSSTransition>(animation);
         if (!removeCSSTransitionFromMap(transition, element.runningTransitionsByProperty()))
-            removeCSSTransitionFromMap(transition, element.completedTransitionByProperty());
+            removeCSSTransitionFromMap(transition, element.completedTransitionsByProperty());
     }
 }
@@ -551 +551 @@
 
     auto& runningTransitionsByProperty = element.runningTransitionsByProperty();
-    auto& completedTransitionsByProperty = element.completedTransitionByProperty();
+    auto& completedTransitionsByProperty = element.completedTransitionsByProperty();
 
     auto generationTime = MonotonicTime::now();

trunk/Source/WebCore/animation/DocumentTimeline.cpp

@@ -548 +548 @@
     if (is<KeyframeEffect>(transition->effect())) {
         if (auto* target = downcast<KeyframeEffect>(transition->effect())->target())
-            target->completedTransitionByProperty().set(transition->property(), transition);
+            target->completedTransitionsByProperty().set(transition->property(), transition);
     }
 }

trunk/Source/WebCore/animation/ElementAnimationRareData.h

@@ -50 +50 @@
     CSSAnimationCollection& animationsCreatedByMarkup() { return m_animationsCreatedByMarkup; }
     void setAnimationsCreatedByMarkup(CSSAnimationCollection&&);
-    PropertyToTransitionMap& completedTransitionByProperty() { return m_completedTransitionByProperty; }
+    PropertyToTransitionMap& completedTransitionsByProperty() { return m_completedTransitionsByProperty; }
     PropertyToTransitionMap& runningTransitionsByProperty() { return m_runningTransitionsByProperty; }
 
@@ -60 +60 @@
     AnimationCollection m_transitions;
     CSSAnimationCollection m_animationsCreatedByMarkup;
-    PropertyToTransitionMap m_completedTransitionByProperty;
+    PropertyToTransitionMap m_completedTransitionsByProperty;
     PropertyToTransitionMap m_runningTransitionsByProperty;
 };

trunk/Source/WebCore/dom/Element.cpp

@@ -3823 +3823 @@
 }
 
-PropertyToTransitionMap& Element::completedTransitionByProperty()
-{
-    return ensureAnimationRareData().completedTransitionByProperty();
+PropertyToTransitionMap& Element::completedTransitionsByProperty()
+{
+    return ensureAnimationRareData().completedTransitionsByProperty();
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -493 +493 @@
     CSSAnimationCollection& animationsCreatedByMarkup();
     void setAnimationsCreatedByMarkup(CSSAnimationCollection&&);
-    PropertyToTransitionMap& completedTransitionByProperty();
+    PropertyToTransitionMap& completedTransitionsByProperty();
     PropertyToTransitionMap& runningTransitionsByProperty();