Attachment 453333 Details for Bug 237246 – Patch

[patch] Patch

bug-237246-20220227122801.patch (text/plain), 4.87 KB, created by Antoine Quint on 2022-02-27 03:28:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2022-02-27 03:28:02 PST

Size: 4.87 KB

patch

obsolete

>Subversion Revision: 290555
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2e99b0327698ea3f9be0de91a95ff68216f8a974..212059c96181cd43dfd392bcaeaeff988a908c74 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,35 @@
>+2022-02-27  Antoine Quint  <graouts@webkit.org>
>+
>+        [css-animations] implicit keyframes should be inserted after explicit keyframes with the same offset
>+        https://bugs.webkit.org/show_bug.cgi?id=237246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The CSS Animations spec says the following about implicit keyframes generation:
>+
>+            Let initial keyframe be the keyframe in keyframes with offset 0, timing function default timing
>+            function and composite default composite.
>+
>+            If there is no such keyframe, let initial keyframe be a new empty keyframe with offset 0, timing
>+            function default timing function, composite |default composite, and add it to keyframes after the
>+            last keyframe with offset 0.
>+
>+            Let final keyframe be the keyframe in keyframes with offset 1, timing function default timing
>+            function and composite default composite.
>+
>+            If there is no such keyframe, let final keyframe be a new empty keyframe with offset 1, timing
>+            function default timing function and composite default composite, and add it to keyframes after
>+            the last keyframe with offset 1.        
>+
>+        Full details are at https://drafts.csswg.org/css-animations-2/#keyframes.
>+
>+        The KeyframeList::insert() method does the right thing already by adding a new keyframe after all
>+        other keyframes with that same offset, so all we need to do is to use this method rather than
>+        specifying explicit indexes.
>+
>+        * rendering/style/KeyframeList.cpp:
>+        (WebCore::KeyframeList::fillImplicitKeyframes):
>+
> 2022-02-26  Tim Nguyen  <ntim@apple.com>
> 
>         Remove Node::deprecatedIsInert
>diff --git a/Source/WebCore/rendering/style/KeyframeList.cpp b/Source/WebCore/rendering/style/KeyframeList.cpp
>index f4af0820aac0675f513dd23a428d070acdb3b6ee..4354739878d5c66ef9f677664e79046e99a776cc 100644
>--- a/Source/WebCore/rendering/style/KeyframeList.cpp
>+++ b/Source/WebCore/rendering/style/KeyframeList.cpp
>@@ -194,10 +194,7 @@ void KeyframeList::fillImplicitKeyframes(const KeyframeEffect& effect, const Ren
>         keyframeValue.setStyle(styleResolver.styleForKeyframe(element, underlyingStyle, { nullptr }, keyframeRule, keyframeValue));
>         for (auto cssPropertyId : implicitProperties)
>             keyframeValue.addProperty(cssPropertyId);
>-        if (!key)
>-            m_keyframes.insert(0, WTFMove(keyframeValue));
>-        else
>-            m_keyframes.append(WTFMove(keyframeValue));
>+        insert(WTFMove(keyframeValue));
>     };
> 
>     if (!zeroKeyframeImplicitProperties.isEmpty())
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 162580ced2ab1dc38eafaf7aa7965dedf99be85c..d55fc76d18a65aa6b721eed156d98840dd8c4ec6 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,15 @@
>+2022-02-27  Antoine Quint  <graouts@webkit.org>
>+
>+        [css-animations] implicit keyframes should be inserted after explicit keyframes with the same offset
>+        https://bugs.webkit.org/show_bug.cgi?id=237246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update WPT test added in bug 236838 to match the spec following discussion with Brian Birtles in
>+        https://github.com/web-platform-tests/wpt/pull/32903.
>+
>+        * web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html:
>+
> 2022-02-26  Tim Nguyen  <ntim@apple.com>
> 
>         Remove Node::deprecatedIsInert
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html
>index ed15e20f29f6bd5b5914b8cf364b8ff91855f0a0..0167fda679996b045ae4205d615f73b72e23095c 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html
>@@ -843,8 +843,8 @@ test(t => {
>   const frames = getKeyframes(div);
> 
>   const expected = [
>-    { offset: 0,   computedOffset: 0,   easing: "ease",   composite: "auto", left: "auto" },
>     { offset: 0,   computedOffset: 0,   easing: "linear", composite: "auto" },
>+    { offset: 0,   computedOffset: 0,   easing: "ease",   composite: "auto", left: "auto" },
>     { offset: 0.5, computedOffset: 0.5, easing: "ease",   composite: "auto", left: "10px" },
>     { offset: 1,   computedOffset: 1,   easing: "linear", composite: "auto" },
>     { offset: 1,   computedOffset: 1,   easing: "ease",   composite: "auto", left: "auto" }

Actions: View | Formatted Diff | Diff

Attachments on bug 237246: 453333