RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 20:22:45 +00:00
Code Issues Activity Actions

LibWeb: Do not invalidate elements with animations in the CSS cascade

Browse source 
See the note added to Animation::cancel for more info
This commit is contained in:
Matthew Olsson 2024-03-02 08:54:37 -07:00 • committed by Andreas Kling
parent b9d2d1b478
commit c1ab6ca6b4
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/Animations/Animation.cpp
View file

@ -396,8 +396,14 @@ void Animation::set_onremove(JS::GCPtr<WebIDL::CallbackType> event_handler)
}
// https://www.w3.org/TR/web-animations-1/#dom-animation-cancel
void Animation::cancel()
void Animation::cancel(ShouldInvalidate should_invalidate)
{
// Note: When called from JS, we always want to invalidate the animation target's style. However, this method is
// also called from the StyleComputer when the animation-name CSS property changes. That happens in the
// middle of a cascade, and importantly, _before_ computing the animation effect stack, so there is no
// need for another invalidation. And in fact, if we did invalidate, it would lead to a crash, as the element
// would not have it's "m_needs_style_update" flag cleared.
auto& realm = this->realm();
// 1. If animation’s play state is not idle, perform the following steps:
@ -452,7 +458,8 @@ void Animation::cancel()
// 3. Make animation’s start time unresolved.
m_start_time = {};
invalidate_effect();
if (should_invalidate == ShouldInvalidate::Yes)
invalidate_effect();
}
// https://www.w3.org/TR/web-animations-1/#dom-animation-finish

6
Userland/Libraries/LibWeb/Animations/Animation.h
View file

@ -77,7 +77,11 @@ public:
Yes,
No,
};
void cancel();
enum class ShouldInvalidate {
Yes,
No,
};
void cancel(ShouldInvalidate = ShouldInvalidate::Yes);
WebIDL::ExceptionOr<void> finish();
WebIDL::ExceptionOr<void> play();
WebIDL::ExceptionOr<void> play_an_animation(AutoRewind);

4
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -1395,7 +1395,7 @@ ErrorOr<void> StyleComputer::compute_cascaded_values(StyleProperties& style, DOM
if (source_declaration != element.cached_animation_name_source()) {
// This animation name is new, so we need to create a new animation for it.
if (auto existing_animation = element.cached_animation_name_animation())
existing_animation->cancel();
existing_animation->cancel(Animations::Animation::ShouldInvalidate::No);
element.set_cached_animation_name_source(source_declaration);
auto effect = Animations::KeyframeEffect::create(realm);
@ -1422,7 +1422,7 @@ ErrorOr<void> StyleComputer::compute_cascaded_values(StyleProperties& style, DOM
} else {
// If the element had an existing animation, cancel it
if (auto existing_animation = element.cached_animation_name_animation()) {
existing_animation->cancel();
existing_animation->cancel(Animations::Animation::ShouldInvalidate::No);
element.set_cached_animation_name_animation({});
element.set_cached_animation_name_source({});
}