diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2015-08-28 12:59:01 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-10-01 12:34:24 +0300 |
| commit | bb4ec0a186f49d3ff146a88b89ed70be008592ab (patch) | |
| tree | 134d887d980a49ccc2333a003593048a0f912fc3 /ivi-shell | |
| parent | dfac375993793d349eff576aba545f978fd611ce (diff) | |
| download | weston-bb4ec0a186f49d3ff146a88b89ed70be008592ab.tar.gz | |
ivi-shell: remove is_layer_in_screen API
This internal API is redundant, because a layer is allowed to be only on
one screen.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Tested-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 23d75247..f815fb44 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -251,21 +251,6 @@ is_surface_in_layer(struct ivi_layout_surface *ivisurf, return 0; } -static int -is_layer_in_screen(struct ivi_layout_layer *ivilayer, - struct ivi_layout_screen *iviscrn) -{ - struct ivi_layout_layer *layer = NULL; - - wl_list_for_each(layer, &iviscrn->pending.layer_list, pending.link) { - if (layer->id_layer == ivilayer->id_layer) { - return 1; - } - } - - return 0; -} - /** * Internal API to initialize ivi_screens found from output_list of weston_compositor. * Called by ivi_layout_init_with_compositor. @@ -2245,15 +2230,13 @@ ivi_layout_screen_add_layer(struct ivi_layout_screen *iviscrn, struct ivi_layout *layout = get_instance(); struct ivi_layout_layer *ivilayer = NULL; struct ivi_layout_layer *next = NULL; - int is_layer_in_scrn = 0; if (iviscrn == NULL || addlayer == NULL) { weston_log("ivi_layout_screen_add_layer: invalid argument\n"); return IVI_FAILED; } - is_layer_in_scrn = is_layer_in_screen(addlayer, iviscrn); - if (is_layer_in_scrn == 1) { + if (addlayer->on_screen == iviscrn) { weston_log("ivi_layout_screen_add_layer: addlayer is already available\n"); return IVI_SUCCEEDED; } |