Changeset 291008 in webkit

Timestamp:

Mar 8, 2022 1:25:12 PM (4 months ago)

Author:

graouts@webkit.org

Message:

[web-animations] color-interpolation should support discrete animation
​https://bugs.webkit.org/show_bug.cgi?id=237610

Reviewed by Tim Nguyen.

LayoutTests/imported/w3c:

Since the input for the strings used in comparison for the WPT tests is using toLowerCase(),
we need to also use toLowerCase() for the output, so that "linearRGB" and "linearrgb" are
both correct values for "color-interpolation" values.

• web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/property-list.js:

Source/WebCore:

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::colorInterpolation const):
(WebCore::RenderStyle::setColorInterpolation):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/property-list.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-03-08  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] color-interpolation should support discrete animation
+        https://bugs.webkit.org/show_bug.cgi?id=237610
+
+        Reviewed by Tim Nguyen.
+
+        Since the input for the strings used in comparison for the WPT tests is using toLowerCase(),
+        we need to also use toLowerCase() for the output, so that "linearRGB" and "linearrgb" are
+        both correct values for "color-interpolation" values.
+
+        * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/property-list.js:
+
 2022-03-08  Sihui Liu  <sihui_liu@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt

@@ -131 +131 @@
 PASS color supports animating as color of rgba()
 PASS color supports animating as color of hsla()
+PASS color-interpolation (type: discrete) has testAccumulation function
+PASS color-interpolation: "auto" onto "linearrgb"
+PASS color-interpolation: "linearrgb" onto "auto"
 PASS column-count (type: positiveInteger) has testAccumulation function
 PASS column-count: positive integer

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt

@@ -131 +131 @@
 PASS color supports animating as color of rgba()
 PASS color supports animating as color of hsla()
+PASS color-interpolation (type: discrete) has testAddition function
+PASS color-interpolation: "auto" onto "linearrgb"
+PASS color-interpolation: "linearrgb" onto "auto"
 PASS column-count (type: positiveInteger) has testAddition function
 PASS column-count: positive integer

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt

@@ -158 +158 @@
 PASS color supports animating as color of rgba()
 PASS color supports animating as color of hsla()
+PASS color-interpolation (type: discrete) has testInterpolation function
+PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with linear easing
+PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with effect easing
+PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with keyframe easing
 PASS column-count (type: positiveInteger) has testInterpolation function
 PASS column-count supports animating as a positive integer

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/property-list.js

@@ -1425 +1425 @@
   for (const testSample of testSamples) {
     animation.currentTime = testSample.time;
-    assert_equals(getComputedStyle(target, pseudoType)[idlName],
+    assert_equals(getComputedStyle(target, pseudoType)[idlName].toLowerCase(),
                   testSample.expected,
                   `The value should be ${testSample.expected}` +

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-08  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] color-interpolation should support discrete animation
+        https://bugs.webkit.org/show_bug.cgi?id=237610
+
+        Reviewed by Tim Nguyen.
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::colorInterpolation const):
+        (WebCore::RenderStyle::setColorInterpolation):
+
 2022-03-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -2808 +2808 @@
         new PropertyWrapperContent,
         new OffsetRotatePropertyWrapper(CSSPropertyOffsetRotate, &RenderStyle::offsetRotate, &RenderStyle::setOffsetRotate),
-        new DiscretePropertyWrapper<TextDecorationSkipInk>(CSSPropertyTextDecorationSkipInk, &RenderStyle::textDecorationSkipInk, &RenderStyle::setTextDecorationSkipInk)
+        new DiscretePropertyWrapper<TextDecorationSkipInk>(CSSPropertyTextDecorationSkipInk, &RenderStyle::textDecorationSkipInk, &RenderStyle::setTextDecorationSkipInk),
+        new DiscretePropertyWrapper<ColorInterpolation>(CSSPropertyColorInterpolation, &RenderStyle::colorInterpolation, &RenderStyle::setColorInterpolation)
     };
     const unsigned animatableLonghandPropertiesCount = WTF_ARRAY_LENGTH(animatableLonghandPropertyWrappers);

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1422 +1422 @@
     const SVGRenderStyle& svgStyle() const { return m_svgStyle; }
     SVGRenderStyle& accessSVGStyle() { return m_svgStyle.access(); }
+
+    ColorInterpolation colorInterpolation() const { return svgStyle().colorInterpolation(); }
+    void setColorInterpolation(ColorInterpolation colorInterpolation) { accessSVGStyle().setColorInterpolation(colorInterpolation); }
 
     SVGPaintType fillPaintType() const { return svgStyle().fillPaintType(); }