mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: simplify ivi_layout_layer_add_surface

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: 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:02 +00:00 committed by Pekka Paalanen
parent 536d833515
commit 10942379d2
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ivi-shell/ivi-layout.c
View File

@ -2184,10 +2184,6 @@ static int32_t
ivi_layout_layer_add_surface(struct ivi_layout_layer *ivilayer,
struct ivi_layout_surface *addsurf)
{
struct ivi_layout *layout = get_instance();
struct ivi_layout_surface *ivisurf = NULL;
struct ivi_layout_surface *next = NULL;
if (ivilayer == NULL || addsurf == NULL) {
weston_log("ivi_layout_layer_add_surface: invalid argument\n");
return IVI_FAILED;
@ -2196,14 +2192,8 @@ ivi_layout_layer_add_surface(struct ivi_layout_layer *ivilayer,
if (addsurf->on_layer == ivilayer)
return IVI_SUCCEEDED;
wl_list_for_each_safe(ivisurf, next, &layout->surface_list, link) {
if (ivisurf->id_surface == addsurf->id_surface) {
wl_list_remove(&ivisurf->pending.link);
wl_list_insert(&ivilayer->pending.surface_list,
&ivisurf->pending.link);
break;
}
}
wl_list_remove(&addsurf->pending.link);
wl_list_insert(&ivilayer->pending.surface_list, &addsurf->pending.link);
ivilayer->order.dirty = 1;