Changeset 276643 in webkit

Timestamp:

Apr 27, 2021 9:40:45 AM (15 months ago)

Author:

graouts@webkit.org

Message:

Correctly interpolate stroke-dasharray in the discrete case
​https://bugs.webkit.org/show_bug.cgi?id=225105

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Mark 3 WPT progressions.

• web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:

Source/WebCore:

• animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/CSSPropertyAnimation.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-04-27  Antoine Quint  <graouts@webkit.org>
+
+        Correctly interpolate stroke-dasharray in the discrete case
+        https://bugs.webkit.org/show_bug.cgi?id=225105
+
+        Reviewed by Antti Koivisto.
+
+        Mark 3 WPT progressions.
+
+        * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:
+
 2021-04-27  Antoine Quint  <graouts@webkit.org>
 

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

@@ -132 +132 @@
 PASS stroke-dasharray supports animating as a dasharray (mixed lengths and percentages)
 PASS stroke-dasharray (type: discrete) has testInterpolation function
-FAIL stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with linear easing assert_equals: The value should be none at 499ms expected "none" but got "10px, 20px"
-FAIL stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with effect easing assert_equals: The value should be none at 940ms expected "none" but got "10px, 20px"
-FAIL stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with keyframe easing assert_equals: The value should be none at 940ms expected "none" but got "10px, 20px"
+PASS stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with linear easing
+PASS stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with effect easing
+PASS stroke-dasharray uses discrete animation when animating between "none" and "10px, 20px" with keyframe easing
 PASS stroke-miterlimit (type: positiveNumber) has testInterpolation function
 FAIL stroke-miterlimit supports animating as a positive number assert_equals: The value should be 1.3 at 500ms expected "1.3" but got "1.2999999523162842"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-27  Antoine Quint  <graouts@webkit.org>
+
+        Correctly interpolate stroke-dasharray in the discrete case
+        https://bugs.webkit.org/show_bug.cgi?id=225105
+
+        Reviewed by Antti Koivisto.
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+
 2021-04-27  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -425 +425 @@
     size_t fromLength = from.size();
     size_t toLength = to.size();
-    if (!fromLength)
-        return !context.progress ? from : to;
-    if (!toLength)
-        return context.progress == 1 ? from : to;
+    if (!fromLength || !toLength)
+        return context.progress < 0.5 ? from : to;
     size_t resultLength = fromLength;
     if (fromLength != toLength) {