Changeset 287535 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Jan 3, 2022, 3:55:54 AM (3 years ago)

Author:

[email protected]

Message:

Support the "animation" shorthand property in the computed style
​https://bugs.webkit.org/show_bug.cgi?id=234785

Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

Mark WPT progressions.

• web-platform-tests/css/css-animations/computed-style-animation-parsing-expected.txt:
• web-platform-tests/css/css-animations/parsing/animation-computed-expected.txt:
• web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt:

Source/WebCore:

There is an existing WPT for the "animation" shorthand in the computed style which we
used to fail because we would simply not do any work to return the longhands compiled
into a list. It seems that the CSS WG, per ​https://github.com/w3c/csswg-drafts/issues/2529,
is moving in the direction of specifying what happens with shorthands in computed style,
so we're adding support for the "animation" shorthand.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::animationShorthandValue):
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1484 +1484 @@
         list->append(ComputedStyleExtractor::valueForAnimationTimingFunction(Animation::initialTimingFunction()));
     return list;
+}
+
+static Ref<CSSValueList> animationShorthandValue(const AnimationList* animationList)
+{
+    auto parentList = CSSValueList::createCommaSeparated();
+    if (animationList) {
+        for (size_t i = 0; i < animationList->size(); ++i) {
+            const auto& animation = animationList->animation(i);
+            auto childList = CSSValueList::createSpaceSeparated();
+            childList->append(ComputedStyleExtractor::valueForAnimationDuration(animation.duration()));
+            childList->append(ComputedStyleExtractor::valueForAnimationTimingFunction(*animation.timingFunction()));
+            childList->append(ComputedStyleExtractor::valueForAnimationDelay(animation.delay()));
+            childList->append(ComputedStyleExtractor::valueForAnimationIterationCount(animation.iterationCount()));
+            childList->append(ComputedStyleExtractor::valueForAnimationDirection(animation.direction()));
+            childList->append(ComputedStyleExtractor::valueForAnimationFillMode(animation.fillMode()));
+            childList->append(ComputedStyleExtractor::valueForAnimationPlayState(animation.playState()));
+            childList->append(ComputedStyleExtractor::valueForAnimationName(animation.name()));
+            parentList->append(childList);
+        }
+    }
+    return parentList;
 }
 
@@ -3567 +3588 @@
                 return cssValuePool.createIdentifierValue(CSSValueContentBox);
             return cssValuePool.createIdentifierValue(CSSValueBorderBox);
+        case CSSPropertyAnimation:
+            return animationShorthandValue(style.animations());
         case CSSPropertyAnimationDelay:
             return delayValue(style.animations());
@@ -4099 +4122 @@
         /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
         case CSSPropertyAll:
-        case CSSPropertyAnimation:
         case CSSPropertyTextEmphasis:
             break;