From: Nobuhiko Tanibata <nobuhiko_tanib...@xddp.denso.co.jp>
ivi_shell_surface lifetime shall follow the ivi_surface protocol object
lifetime, and frees the ivi-id by destroying the ivi_layout_surface
from both wl_surface and ivi_surface destruction as the protocol specifies.
Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanib...@xddp.denso.co.jp>
Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
---
ivi-shell/ivi-shell.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index a147353..896ba1b 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -155,9 +155,18 @@ static void
shell_destroy_shell_surface(struct wl_resource *resource)
{
struct ivi_shell_surface *ivisurf = wl_resource_get_user_data(resource);
- if (ivisurf != NULL) {
- ivisurf->resource = NULL;
- }
+
+ if (ivisurf == NULL)
+ return;
+
+ assert(ivisurf->resource == resource);
+
+ if (ivisurf->layout_surface != NULL)
+ layout_surface_cleanup(ivisurf);
+
+ wl_list_remove(&ivisurf->link);
+
+ free(ivisurf);
}
/* Gets called through the weston_surface destroy signal. */
@@ -172,13 +181,6 @@ shell_handle_surface_destroy(struct wl_listener *listener,
void *data)
if (ivisurf->layout_surface != NULL)
layout_surface_cleanup(ivisurf);
-
- if (ivisurf->resource != NULL) {
- wl_resource_set_user_data(ivisurf->resource, NULL);
- ivisurf->resource = NULL;
- }
- free(ivisurf);
-
}
/* Gets called, when a client sends ivi_surface.destroy request. */
--
1.8.3.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
