fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-20 12:38:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ivi-shell: simplify ivi_layout_screen_set_render_order

Browse source 
It is not necessary check the ivi-id of pregiven objects (layer or
surface). Traversing the list of all objects is sure to find the exact
same pointer we start with, bugs aside.

The controller modules are responsible for providing valid pointers. We
cannot protect from invalid pointers anyway.

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
[Pekka: fix subject, add commit message]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Ucan, Emre (ADITG/SW1) 2016-03-16 13:37:08 +00:00 • committed by Pekka Paalanen
parent f46306f059
commit 4e221f0327
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ivi-shell/ivi-layout.c
View file

@ -2037,10 +2037,8 @@ ivi_layout_screen_set_render_order(struct ivi_layout_screen *iviscrn,
struct ivi_layout_layer **pLayer,
const int32_t number)
{
struct ivi_layout *layout = get_instance();
struct ivi_layout_layer *ivilayer = NULL;
struct ivi_layout_layer *next = NULL;
uint32_t *id_layer = NULL;
int32_t i = 0;
if (iviscrn == NULL) {
@ -2057,17 +2055,9 @@ ivi_layout_screen_set_render_order(struct ivi_layout_screen *iviscrn,
assert(wl_list_empty(&iviscrn->pending.layer_list));
for (i = 0; i < number; i++) {
id_layer = &pLayer[i]->id_layer;
wl_list_for_each(ivilayer, &layout->layer_list, link) {
if (*id_layer != ivilayer->id_layer) {
continue;
}
wl_list_remove(&ivilayer->pending.link);
wl_list_insert(&iviscrn->pending.layer_list,
&ivilayer->pending.link);
break;
}
wl_list_remove(&pLayer[i]->pending.link);
wl_list_insert(&iviscrn->pending.layer_list,
&pLayer[i]->pending.link);
}
iviscrn->order.dirty = 1;