Pending surfaces will only get a valid role when the client shell sends
out ready() request to start presenting. Corner-case would be that
pending surface is destroyed, moment in which we realise we never set-up
an output. This is corner-case and treat as is.
Bug-AGL: SPEC-3448
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I2eb9c937878fb6af56f3fbcf0d5da10a8003f634
weston_desktop_surface_get_surface(dsurface);
struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
weston_desktop_surface_get_surface(dsurface);
struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+
+ /* special corner-case, pending_surfaces which are never activated or
+ * being assigned an output might land here so just remove the surface */
+ if (output == NULL && surface->role == IVI_SURFACE_ROLE_NONE)
+ goto skip_output_asignment;
+
assert(output != NULL);
/* resize the active surface to the original size */
assert(output != NULL);
/* resize the active surface to the original size */
output->background = NULL;
}
output->background = NULL;
}
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
weston_desktop_surface_get_app_id(dsurface),
ivi_layout_get_surface_role_name(surface));
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
weston_desktop_surface_get_app_id(dsurface),
ivi_layout_get_surface_role_name(surface));