Changeset 290898 in webkit

Timestamp:

Mar 7, 2022, 11:13:52 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[web-animations] animating "fill" and "stroke" to or from "currentColor" should work
​https://bugs.webkit.org/show_bug.cgi?id=237531

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

• web-platform-tests/web-animations/responsive/to-color-change-expected.txt:

Source/WebCore:

Invalid colors should use the value for the "color" property on the provided RenderStyle.

• animation/CSSPropertyAnimation.cpp:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/responsive/to-color-change-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-03-07  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] animating "fill" and "stroke" to or from "currentColor" should work
+        https://bugs.webkit.org/show_bug.cgi?id=237531
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/web-animations/responsive/to-color-change-expected.txt:
+
 2022-03-07  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/responsive/to-color-change-expected.txt

@@ -1 +1 @@
 
 PASS Background color responsive to currentColor changes
-FAIL Fill color responsive to currentColor changes assert_equals: expected "rgb(0, 34, 102)" but got "rgb(0, 0, 0)"
+PASS Fill color responsive to currentColor changes
 PASS Color interpolation uses pre-multiplied colors
 PASS Border color responsive to currentColor changes
 PASS Border color responsive to currentColor changes again
 PASS Outline color responsive to currentColor changes
-FAIL Stroke color responsive to currentColor changes assert_equals: expected "rgb(0, 34, 102)" but got "none"
+PASS Stroke color responsive to currentColor changes
 PASS Text decoration color responsive to currentColor changes
 FAIL Color responsive to parent currentColor changes assert_equals: expected "rgb(34, 51, 34)" but got "rgb(0, 51, 51)"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-07  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] animating "fill" and "stroke" to or from "currentColor" should work
+        https://bugs.webkit.org/show_bug.cgi?id=237531
+
+        Reviewed by Antti Koivisto.
+
+        Invalid colors should use the value for the "color" property on the provided RenderStyle. 
+
+        * animation/CSSPropertyAnimation.cpp:
+
 2022-03-07  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -2122 +2122 @@
 
             if (!fromColor.isValid())
-                fromColor = Color();
+                fromColor = a.color();
             if (!toColor.isValid())
-                toColor = Color();
+                toColor = b.color();
 
             return fromColor == toColor;
@@ -2133 +2133 @@
     void blend(RenderStyle& destination, const RenderStyle& from, const RenderStyle& to, const CSSPropertyBlendingContext& context) const final
     {
-        if ((from.*m_paintTypeGetter)() != SVGPaintType::RGBColor
-            || (to.*m_paintTypeGetter)() != SVGPaintType::RGBColor)
+        auto isValidPaintType = [](SVGPaintType paintType) {
+            return paintType == SVGPaintType::RGBColor || paintType == SVGPaintType::CurrentColor;
+        };
+
+        if (!isValidPaintType((from.*m_paintTypeGetter)()) || !isValidPaintType((to.*m_paintTypeGetter)()))
             return;
 
@@ -2144 +2147 @@
 
         if (!fromColor.isValid())
-            fromColor = Color();
+            fromColor = from.color();
         if (!toColor.isValid())
-            toColor = Color();
+            toColor = to.color();
         (destination.*m_setter)(blendFunc(fromColor, toColor, context));
     }