Changeset 287762 in webkit

Timestamp:

Jan 7, 2022, 10:48:40 AM (5 years ago)

Author:

graouts@webkit.org

Message:

Expose iterators on AnimationList
​https://bugs.webkit.org/show_bug.cgi?id=234957

Reviewed by Antti Koivisto.

• animation/WebAnimationUtilities.cpp:

(WebCore::compareCSSAnimations):

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::valueListForAnimationOrTransitionProperty):
(WebCore::animationShorthandValue):

• css/makeprop.pl:

(generateAnimationPropertyInitialValueSetter):

• platform/animation/AnimationList.h:

(WebCore::AnimationList::begin const):
(WebCore::AnimationList::end const):
(WebCore::AnimationList::rbegin const):
(WebCore::AnimationList::rend const):

• style/Styleable.cpp:

(WebCore::Styleable::updateCSSAnimations const):
(WebCore::compileTransitionPropertiesInStyle):
(WebCore::updateCSSTransitionsForStyleableAndProperty):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/WebAnimationUtilities.cpp (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• css/makeprop.pl (modified) (1 diff)
• platform/animation/AnimationList.h (modified) (1 diff)
• style/Styleable.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-07  Antoine Quint  <graouts@webkit.org>
+
+        Expose iterators on AnimationList
+        https://bugs.webkit.org/show_bug.cgi?id=234957
+
+        Reviewed by Antti Koivisto.
+
+        * animation/WebAnimationUtilities.cpp:
+        (WebCore::compareCSSAnimations):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::valueListForAnimationOrTransitionProperty):
+        (WebCore::animationShorthandValue):
+        * css/makeprop.pl:
+        (generateAnimationPropertyInitialValueSetter):
+        * platform/animation/AnimationList.h:
+        (WebCore::AnimationList::begin const):
+        (WebCore::AnimationList::end const):
+        (WebCore::AnimationList::rbegin const):
+        (WebCore::AnimationList::rend const):
+        * style/Styleable.cpp:
+        (WebCore::Styleable::updateCSSAnimations const):
+        (WebCore::compileTransitionPropertiesInStyle):
+        (WebCore::updateCSSTransitionsForStyleableAndProperty):
+
 2022-01-07  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/animation/WebAnimationUtilities.cpp

@@ -133 +133 @@
     auto& aBackingAnimation = a.backingAnimation();
     auto& bBackingAnimation = b.backingAnimation();
-    for (size_t i = 0; i < cssAnimationList->size(); ++i) {
-        auto& animation = cssAnimationList->animation(i);
-        if (&animation == &aBackingAnimation)
+    for (auto& animation : *cssAnimationList) {
+        if (animation.ptr() == &aBackingAnimation)
             return true;
-        if (&animation == &bBackingAnimation)
+        if (animation.ptr() == &bBackingAnimation)
             return false;
     }

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1475 +1475 @@
     auto list = CSSValueList::createCommaSeparated();
     if (animationList) {
-        for (size_t i = 0; i < animationList->size(); ++i)
-            ComputedStyleExtractor::addValueForAnimationPropertyToList(list.get(), property, &animationList->animation(i));
+        for (const auto& animation : *animationList)
+            ComputedStyleExtractor::addValueForAnimationPropertyToList(list.get(), property, animation.ptr());
     } else
         ComputedStyleExtractor::addValueForAnimationPropertyToList(list.get(), property, nullptr);
@@ -1486 +1486 @@
     auto parentList = CSSValueList::createCommaSeparated();
     if (animationList) {
-        for (size_t i = 0; i < animationList->size(); ++i) {
-            const auto& animation = animationList->animation(i);
+        for (const auto& animation : *animationList) {
             auto childList = CSSValueList::createSpaceSeparated();
             for (auto longhand : shorthandForProperty(property))
-                ComputedStyleExtractor::addValueForAnimationPropertyToList(childList.get(), longhand, &animation);
+                ComputedStyleExtractor::addValueForAnimationPropertyToList(childList.get(), longhand, animation.ptr());
             parentList->append(childList);
         }

trunk/Source/WebCore/css/makeprop.pl

@@ -1068 +1068 @@
   my $initial = $propertiesWithStyleBuilderOptions{$name}{"initial"};
   $setterContent .= $indent . "list.animation(0)." . $setter . "(Animation::" . $initial . "());\n";
-  $setterContent .= $indent . "for (size_t i = 1; i < list.size(); ++i)\n";
-  $setterContent .= $indent . "    list.animation(i)." . getClearFunction($name) . "();\n";
+  $setterContent .= $indent . "for (auto& animation : list)\n";
+  $setterContent .= $indent . "    animation->" . getClearFunction($name) . "();\n";
 
   return $setterContent;

trunk/Source/WebCore/platform/animation/AnimationList.h

@@ -55 +55 @@
     Animation& animation(size_t i) { return m_animations[i].get(); }
     const Animation& animation(size_t i) const { return m_animations[i].get(); }
-    
+
+    auto begin() const { return m_animations.begin(); }
+    auto end() const { return m_animations.end(); }
+
+    using const_reverse_iterator = Vector<Ref<Animation>>::const_reverse_iterator;
+    const_reverse_iterator rbegin() const { return m_animations.rbegin(); }
+    const_reverse_iterator rend() const { return m_animations.rend(); }
+
 private:
     AnimationList();

trunk/Source/WebCore/style/Styleable.cpp

@@ -247 +247 @@
     // first item in the list.
     if (currentAnimationList) {
-        for (size_t i = currentAnimationList->size(); i > 0; --i) {
-            auto& currentAnimation = currentAnimationList->animation(i - 1);
-            if (!shouldConsiderAnimation(this->element, currentAnimation))
+        for (auto& currentAnimation : makeReversedRange(*currentAnimationList)) {
+            if (!shouldConsiderAnimation(this->element, currentAnimation.get()))
                 continue;
 
             bool foundMatchingAnimation = false;
             for (auto& previousAnimation : previousAnimations) {
-                if (previousAnimation->animationName() == currentAnimation.name().string) {
+                if (previousAnimation->animationName() == currentAnimation->name().string) {
                     // Timing properties or play state may have changed so we need to update the backing animation with
                     // the Animation found in the current style.
-                    previousAnimation->setBackingAnimation(currentAnimation);
+                    previousAnimation->setBackingAnimation(currentAnimation.get());
                     // Keyframes may have been cleared if the @keyframes rules was changed since
                     // the last style update, so we must ensure keyframes are picked up.
@@ -270 +269 @@
 
             if (!foundMatchingAnimation)
-                newAnimations.add(CSSAnimation::create(*this, currentAnimation, currentStyle, newStyle, resolutionContext));
+                newAnimations.add(CSSAnimation::create(*this, currentAnimation.get(), currentStyle, newStyle, resolutionContext));
         }
     }
@@ -343 +342 @@
         return;
 
-    for (size_t i = 0; i < transitions->size(); ++i) {
-        const auto& animation = transitions->animation(i);
-        auto mode = animation.property().mode;
+    for (const auto& animation : *transitions) {
+        auto mode = animation->property().mode;
         if (mode == Animation::TransitionMode::SingleProperty) {
-            auto property = animation.property().id;
+            auto property = animation->property().id;
             if (isShorthandCSSProperty(property)) {
                 for (auto longhand : shorthandForProperty(property))
@@ -376 +374 @@
     const Animation* matchingBackingAnimation = nullptr;
     if (auto* transitions = newStyle.transitions()) {
-        for (size_t i = 0; i < transitions->size(); ++i) {
-            auto& backingAnimation = transitions->animation(i);
-            if (transitionMatchesProperty(backingAnimation, property))
-                matchingBackingAnimation = &backingAnimation;
+        for (auto& backingAnimation : *transitions) {
+            if (transitionMatchesProperty(backingAnimation.get(), property))
+                matchingBackingAnimation = backingAnimation.ptr();
         }
     }