system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-21 02:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell: Fix memory leaks caused by the window close animation

Browse source 
In order to do the window close animation, a reference for a destroyed
surface is kept. However, the reference count was also increased for
unmapped surfaces, in which case the animation wouldn't run. Since the
reference count was decremented in the animation done function, it would
never be decreased for unmapped surfaces, causing them to not be
released.

The close animation also changed how shell surfaces are released. The
destroy function for its resource was changed to not deallocate the
surface, and instead keep it around until the animation finishes and
the weston surface is destroyed. The destruction should happen in the
destroy listener for the weston surface, but it wouldn't destroy the
shell surface in the case the resource was still valid, assuming that
it would be freed in the resource destroy function.
This commit is contained in:
Ander Conselvan de Oliveira 2014-04-29 17:54:02 +03:00 committed by Kristian Høgsberg
parent 66cd2c1ce1
commit 15f9a26bb1
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop-shell/shell.c
View file

@ -3081,8 +3081,8 @@ shell_handle_surface_destroy(struct wl_listener *listener, void *data)
if (shsurf->resource)
wl_resource_destroy(shsurf->resource);
else
destroy_shell_surface(shsurf);
destroy_shell_surface(shsurf);
}
static void
@ -3100,15 +3100,17 @@ handle_resource_destroy(struct wl_listener *listener, void *data)
container_of(listener, struct shell_surface,
resource_destroy_listener);
if (!weston_surface_is_mapped(shsurf->surface))
return;
shsurf->surface->ref_count++;
pixman_region32_fini(&shsurf->surface->pending.input);
pixman_region32_init(&shsurf->surface->pending.input);
pixman_region32_fini(&shsurf->surface->input);
pixman_region32_init(&shsurf->surface->input);
if (weston_surface_is_mapped(shsurf->surface))
weston_fade_run(shsurf->view, 1.0, 0.0, 300.0,
fade_out_done, shsurf);
weston_fade_run(shsurf->view, 1.0, 0.0, 300.0,
fade_out_done, shsurf);
}
static void