diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2017-01-30 13:36:05 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-02-06 12:10:56 +0200 |
| commit | 1b92ba20ac28b9882d5225a1d990c46fb47a61a7 (patch) | |
| tree | dab197c0440896ac24ed820259d6f056d2981309 /ivi-shell | |
| parent | 819824d605547a23c68999bec5133c2387c20e1e (diff) | |
ivi-shell: pass only ivi_view to update_prop
We can get ivisurf, ivilayer and iviscreen
easily from ivi_view. Then, we do not need
to check, if ivi_view's layer is the same
as the given ivilayer.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 2b218331..6c13fee4 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -612,18 +612,14 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface( } static void -update_prop(struct ivi_layout_screen *iviscrn, - struct ivi_layout_layer *ivilayer, - struct ivi_layout_view *ivi_view) +update_prop(struct ivi_layout_view *ivi_view) { - struct ivi_layout_surface *ivisurf; + struct ivi_layout_surface *ivisurf = ivi_view->ivisurf; + struct ivi_layout_layer *ivilayer = ivi_view->on_layer; + struct ivi_layout_screen *iviscrn = ivilayer->on_screen; struct ivi_rectangle r; bool can_calc = true; - assert(ivi_view->on_layer == ivilayer); - - ivisurf = ivi_view->ivisurf; - /*In case of no prop change, this just returns*/ if (!ivilayer->prop.event_mask && !ivisurf->prop.event_mask) return; @@ -685,7 +681,7 @@ commit_changes(struct ivi_layout *layout) if (ivi_view->ivisurf->prop.visibility == false) continue; - update_prop(iviscrn, ivilayer, ivi_view); + update_prop(ivi_view); } } } |