We don't need to free the ivi_surface when un-binding the agl-shell, as
that should happen when `desktop_surface_removed()` is called.
We'll just invalidate them depending on the role so that next time we're
going to able to bind again.
Bug-AGL: SPEC-3404
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I6e06b6a1029989bf3e09156b602b6eab6addc5da
weston_view_destroy(surface->view);
}
+ /* invalidate agl-shell surfaces so we can re-use them when
+ * binding again */
+ if (surface->role == IVI_SURFACE_ROLE_PANEL) {
+ switch (surface->panel.edge) {
+ case AGL_SHELL_EDGE_TOP:
+ output->top = NULL;
+ break;
+ case AGL_SHELL_EDGE_BOTTOM:
+ output->bottom = NULL;
+ break;
+ case AGL_SHELL_EDGE_LEFT:
+ output->left = NULL;
+ break;
+ case AGL_SHELL_EDGE_RIGHT:
+ output->right = NULL;
+ break;
+ default:
+ assert(!"Invalid edge detected\n");
+ }
+ } else if (surface->role == IVI_SURFACE_ROLE_BACKGROUND) {
+ output->background = NULL;
+ }
+
wl_list_remove(&surface->link);
free(surface);
}
ivi = wl_resource_get_user_data(resource);
wl_list_for_each(output, &ivi->outputs, link) {
- free(output->background);
- output->background = NULL;
-
- free(output->top);
- output->top = NULL;
-
- free(output->bottom);
- output->bottom = NULL;
-
- free(output->left);
- output->left = NULL;
-
- free(output->right);
- output->right = NULL;
-
/* reset the active surf if there's one present */
if (output->active) {
output->active->view->is_mapped = false;