mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-07 21:59:54 +00:00
LibWeb: Support triggering multiple animations per animation property
We also now use the computed (rather than cascaded) values when triggering animations.
This commit is contained in:
parent
18477b0d84
commit
84762021b8
Notes:
github-actions[bot]
2025-10-27 09:49:34 +00:00
Author: https://github.com/Calme1709
Commit: 84762021b8
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6585
Reviewed-by: https://github.com/AtkinsSJ ✅
11 changed files with 322 additions and 231 deletions
|
|
@ -4089,34 +4089,35 @@ void Element::play_or_cancel_animations_after_display_property_change()
|
|||
|
||||
auto has_display_none_inclusive_ancestor = this->has_inclusive_ancestor_with_display_none();
|
||||
|
||||
auto play_or_cancel_depending_on_display = [&](Animations::Animation& animation, Optional<CSS::PseudoElement> pseudo_element) {
|
||||
if (has_display_none_inclusive_ancestor) {
|
||||
animation.cancel();
|
||||
} else {
|
||||
auto play_state { CSS::AnimationPlayState::Running };
|
||||
if (auto play_state_property = cascaded_properties(pseudo_element)->property(CSS::PropertyID::AnimationPlayState);
|
||||
play_state_property && play_state_property->is_keyword()) {
|
||||
if (auto play_state_value = keyword_to_animation_play_state(
|
||||
play_state_property->to_keyword());
|
||||
play_state_value.has_value())
|
||||
play_state = *play_state_value;
|
||||
}
|
||||
if (play_state == CSS::AnimationPlayState::Running) {
|
||||
HTML::TemporaryExecutionContext context(realm());
|
||||
animation.play().release_value_but_fixme_should_propagate_errors();
|
||||
} else if (play_state == CSS::AnimationPlayState::Paused) {
|
||||
HTML::TemporaryExecutionContext context(realm());
|
||||
animation.pause().release_value_but_fixme_should_propagate_errors();
|
||||
auto play_or_cancel_depending_on_display = [&](HashMap<FlyString, GC::Ref<Animations::Animation>>& animations, Optional<CSS::PseudoElement> pseudo_element) {
|
||||
for (auto& [_, animation] : animations) {
|
||||
if (has_display_none_inclusive_ancestor) {
|
||||
animation->cancel();
|
||||
} else {
|
||||
auto play_state { CSS::AnimationPlayState::Running };
|
||||
if (auto play_state_property = cascaded_properties(pseudo_element)->property(CSS::PropertyID::AnimationPlayState);
|
||||
play_state_property && play_state_property->is_keyword()) {
|
||||
if (auto play_state_value = keyword_to_animation_play_state(
|
||||
play_state_property->to_keyword());
|
||||
play_state_value.has_value())
|
||||
play_state = *play_state_value;
|
||||
}
|
||||
if (play_state == CSS::AnimationPlayState::Running) {
|
||||
HTML::TemporaryExecutionContext context(realm());
|
||||
animation->play().release_value_but_fixme_should_propagate_errors();
|
||||
} else if (play_state == CSS::AnimationPlayState::Paused) {
|
||||
HTML::TemporaryExecutionContext context(realm());
|
||||
animation->pause().release_value_but_fixme_should_propagate_errors();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (auto animation = cached_animation_name_animation({}))
|
||||
play_or_cancel_depending_on_display(*animation, {});
|
||||
play_or_cancel_depending_on_display(*css_defined_animations({}), {});
|
||||
|
||||
for (auto i = 0; i < to_underlying(CSS::PseudoElement::KnownPseudoElementCount); i++) {
|
||||
auto pseudo_element = static_cast<CSS::PseudoElement>(i);
|
||||
if (auto animation = cached_animation_name_animation(pseudo_element))
|
||||
play_or_cancel_depending_on_display(*animation, pseudo_element);
|
||||
play_or_cancel_depending_on_display(*css_defined_animations(pseudo_element), pseudo_element);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue