RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:07:35 +00:00
Code Issues Activity Actions

WindowServer: Fix animation crash

Browse source 
If an Animation's on_stop handler cleared itself inside the on_stop
event handler, it would remove itself from the animation map that was
still being iterated, leading to a crash.

To solve this, we'll iterate over the animations using the
remove_all_matching function, which enables us to delete it by simply
returning true when the animation finished. In the event that the
Animation is kept alive elsewhere and the on_stop event clears its own
reference, we need to temporarily bump the reference count. Another
advantage is that we only need to bump the reference count when an
animation is finished, whereas before this we bumped it
unconditionally.
This commit is contained in:
Tom 2022-03-16 20:22:13 -06:00 • committed by Andreas Kling
parent 56046d3f9b
commit 9f59d7d9a0
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/WindowServer/Animation.cpp
View file

@ -17,7 +17,8 @@ Animation::Animation()
Animation::~Animation()
{
Compositor::the().unregister_animation({}, *this);
if (!m_was_removed)
Compositor::the().unregister_animation({}, *this);
}
void Animation::set_duration(int duration_in_ms)
@ -39,7 +40,12 @@ void Animation::stop()
on_stop();
}
void Animation::update(Badge<Compositor>, Gfx::Painter& painter, Screen& screen, Gfx::DisjointRectSet& flush_rects)
void Animation::was_removed(Badge<Compositor>)
{
m_was_removed = true;
}
bool Animation::update(Badge<Compositor>, Gfx::Painter& painter, Screen& screen, Gfx::DisjointRectSet& flush_rects)
{
int elapsed_ms = m_timer.elapsed();
float progress = min((float)elapsed_ms / (float)m_duration, 1.0f);
@ -47,8 +53,7 @@ void Animation::update(Badge<Compositor>, Gfx::Painter& painter, Screen& screen,
if (on_update)
on_update(progress, painter, screen, flush_rects);
if (progress >= 1.0f)
stop();
return progress < 1.0f;
}
}