Skip to content

[css-animations-2] Account for animation-composition when merging keyframes (closes #6935) #6974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

graouts
Copy link
Contributor

@graouts graouts commented Jan 21, 2022

Keyframes should only be merged when they have matching keyframe offset, timing function and composite.

@graouts
Copy link
Contributor Author

graouts commented Jan 21, 2022

I have filed web-platform-tests/wpt#32495 with the relevant test changes.

@graouts graouts requested a review from birtles January 22, 2022 20:21
@graouts graouts merged commit 4f69b43 into w3c:main Jan 24, 2022
@graouts graouts deleted the animation-composite-for-keyframe-deduplication branch January 24, 2022 11:17
webkit-commit-queue pushed a commit to WebKit/WebKit that referenced this pull request Jan 25, 2022
…sition

https://bugs.webkit.org/show_bug.cgi?id=235596

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Import test recently added in WPT via web-platform-tests/wpt#32495.
We pass them all with the source change.

* web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative-expected.txt:
* web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html:

Source/WebCore:

The CSS Animations Level 2 spec recently changed to account for animation-composition
when deduplicating @Keyframes rules (see w3c/csswg-drafts#6974).

* animation/CompositeOperation.h:
* style/StyleResolver.cpp:
(WebCore::Style::Resolver::keyframeRulesForName const):



Canonical link: https://commits.webkit.org/246394@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
annulen pushed a commit to qtwebkit/qtwebkit that referenced this pull request Jan 26, 2022
…sition

https://bugs.webkit.org/show_bug.cgi?id=235596

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Import test recently added in WPT via web-platform-tests/wpt#32495.
We pass them all with the source change.

* web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative-expected.txt:
* web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html:

Source/WebCore:

The CSS Animations Level 2 spec recently changed to account for animation-composition
when deduplicating @Keyframes rules (see w3c/csswg-drafts#6974).

* animation/CompositeOperation.h:
* style/StyleResolver.cpp:
(WebCore::Style::Resolver::keyframeRulesForName const):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants