[webkit-changes] [258827] trunk/Source/WebCore

Mon, 23 Mar 2020 02:06:46 -0700

Title: [258827] trunk/Source/WebCore
Revision
258827
Author
grao...@webkit.org
Date
2020-03-23 02:05:26 -0700 (Mon, 23 Mar 2020)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (258826 => 258827)


--- trunk/Source/WebCore/ChangeLog	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/ChangeLog	2020-03-23 09:05:26 UTC (rev 258827)
@@ -1,3 +1,25 @@
+2020-03-23  Antoine Quint  <grao...@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  <grao...@apple.com>
 
         DocumentTimeline / CSSTransition objects are leaking on CNN.com

Modified: trunk/Source/WebCore/animation/AnimationTimeline.cpp (258826 => 258827)


--- trunk/Source/WebCore/animation/AnimationTimeline.cpp	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/animation/AnimationTimeline.cpp	2020-03-23 09:05:26 UTC (rev 258827)
@@ -140,7 +140,7 @@
     if (is<CSSTransition>(animation)) {
         auto& transition = downcast<CSSTransition>(animation);
         if (!removeCSSTransitionFromMap(transition, element.runningTransitionsByProperty()))
-            removeCSSTransitionFromMap(transition, element.completedTransitionByProperty());
+            removeCSSTransitionFromMap(transition, element.completedTransitionsByProperty());
     }
 }
 
@@ -550,7 +550,7 @@
     // https://drafts.csswg.org/css-transitions-1/#starting
 
     auto& runningTransitionsByProperty = element.runningTransitionsByProperty();
-    auto& completedTransitionsByProperty = element.completedTransitionByProperty();
+    auto& completedTransitionsByProperty = element.completedTransitionsByProperty();
 
     auto generationTime = MonotonicTime::now();

Modified: trunk/Source/WebCore/animation/DocumentTimeline.cpp (258826 => 258827)


--- trunk/Source/WebCore/animation/DocumentTimeline.cpp	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/animation/DocumentTimeline.cpp	2020-03-23 09:05:26 UTC (rev 258827)
@@ -547,7 +547,7 @@
     removeAnimation(*transition);
     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);
     }
 }

Modified: trunk/Source/WebCore/animation/ElementAnimationRareData.h (258826 => 258827)


--- trunk/Source/WebCore/animation/ElementAnimationRareData.h	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/animation/ElementAnimationRareData.h	2020-03-23 09:05:26 UTC (rev 258827)
@@ -49,7 +49,7 @@
     AnimationCollection& transitions() { return m_transitions; }
     CSSAnimationCollection& animationsCreatedByMarkup() { return m_animationsCreatedByMarkup; }
     void setAnimationsCreatedByMarkup(CSSAnimationCollection&&);
-    PropertyToTransitionMap& completedTransitionByProperty() { return m_completedTransitionByProperty; }
+    PropertyToTransitionMap& completedTransitionsByProperty() { return m_completedTransitionsByProperty; }
     PropertyToTransitionMap& runningTransitionsByProperty() { return m_runningTransitionsByProperty; }
 
 private:
@@ -59,7 +59,7 @@
     AnimationCollection m_cssAnimations;
     AnimationCollection m_transitions;
     CSSAnimationCollection m_animationsCreatedByMarkup;
-    PropertyToTransitionMap m_completedTransitionByProperty;
+    PropertyToTransitionMap m_completedTransitionsByProperty;
     PropertyToTransitionMap m_runningTransitionsByProperty;
 };

Modified: trunk/Source/WebCore/dom/Element.cpp (258826 => 258827)


--- trunk/Source/WebCore/dom/Element.cpp	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/dom/Element.cpp	2020-03-23 09:05:26 UTC (rev 258827)
@@ -3822,9 +3822,9 @@
     ensureAnimationRareData().setAnimationsCreatedByMarkup(WTFMove(animations));
 }
 
-PropertyToTransitionMap& Element::completedTransitionByProperty()
+PropertyToTransitionMap& Element::completedTransitionsByProperty()
 {
-    return ensureAnimationRareData().completedTransitionByProperty();
+    return ensureAnimationRareData().completedTransitionsByProperty();
 }
 
 PropertyToTransitionMap& Element::runningTransitionsByProperty()

Modified: trunk/Source/WebCore/dom/Element.h (258826 => 258827)


--- trunk/Source/WebCore/dom/Element.h	2020-03-23 08:17:26 UTC (rev 258826)
+++ trunk/Source/WebCore/dom/Element.h	2020-03-23 09:05:26 UTC (rev 258827)
@@ -492,7 +492,7 @@
     AnimationCollection& transitions();
     CSSAnimationCollection& animationsCreatedByMarkup();
     void setAnimationsCreatedByMarkup(CSSAnimationCollection&&);
-    PropertyToTransitionMap& completedTransitionByProperty();
+    PropertyToTransitionMap& completedTransitionsByProperty();
     PropertyToTransitionMap& runningTransitionsByProperty();
 
 #if ENABLE(FULLSCREEN_API)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to