Title: [276643] trunk
Revision
276643
Author
grao...@webkit.org
Date
2021-04-27 09:40:45 -0700 (Tue, 27 Apr 2021)

Log 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):

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (276642 => 276643)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2021-04-27 16:23:26 UTC (rev 276642)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2021-04-27 16:40:45 UTC (rev 276643)
@@ -1,5 +1,16 @@
 2021-04-27  Antoine Quint  <grao...@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  <grao...@webkit.org>
+
         Fix animation of the visibility CSS property between "hidden" and "collapse"
         https://bugs.webkit.org/show_bug.cgi?id=225103
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt (276642 => 276643)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt	2021-04-27 16:23:26 UTC (rev 276642)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt	2021-04-27 16:40:45 UTC (rev 276643)
@@ -131,9 +131,9 @@
 PASS stroke-dasharray supports animating as a dasharray (mismatched length)
 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"
 PASS stroke-opacity (type: opacity) has testInterpolation function

Modified: trunk/Source/WebCore/ChangeLog (276642 => 276643)


--- trunk/Source/WebCore/ChangeLog	2021-04-27 16:23:26 UTC (rev 276642)
+++ trunk/Source/WebCore/ChangeLog	2021-04-27 16:40:45 UTC (rev 276643)
@@ -1,5 +1,15 @@
 2021-04-27  Antoine Quint  <grao...@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  <grao...@webkit.org>
+
         Fix animation of the visibility CSS property between "hidden" and "collapse"
         https://bugs.webkit.org/show_bug.cgi?id=225103
 

Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (276642 => 276643)


--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp	2021-04-27 16:23:26 UTC (rev 276642)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp	2021-04-27 16:40:45 UTC (rev 276643)
@@ -424,10 +424,8 @@
 {
     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) {
         if (!remainder(std::max(fromLength, toLength), std::min(fromLength, toLength)))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to