From ff356fe1df1b4e6aac82d2349489d051566519c3 Mon Sep 17 00:00:00 2001 From: Emre Ucan Date: Wed, 18 May 2016 13:27:15 +0200 Subject: ivi-controller: remove update_surface_prop The update_surface_prop function only updates on_layer member of ivisurf struct. But on_layer member is never used. Therefore, I removed the function and the member. Signed-off-by: Emre Ucan --- weston-ivi-shell/src/ivi-controller-impl.c | 42 ------------------------------ 1 file changed, 42 deletions(-) diff --git a/weston-ivi-shell/src/ivi-controller-impl.c b/weston-ivi-shell/src/ivi-controller-impl.c index 5629234..aa98571 100644 --- a/weston-ivi-shell/src/ivi-controller-impl.c +++ b/weston-ivi-shell/src/ivi-controller-impl.c @@ -46,7 +46,6 @@ struct ivisurface { uint32_t update_count; struct ivi_layout_surface *layout_surface; struct wl_listener surface_destroy_listener; - struct ivilayer *on_layer; struct wl_list resource_list; }; @@ -253,45 +252,6 @@ send_surface_event(struct wl_resource *resource, } } -static void -update_surface_prop(struct ivisurface *ivisurf, - uint32_t mask) -{ - struct ivi_layout_layer **pArray = NULL; - int32_t length = 0; - int32_t ans = 0; - int i = 0; - struct ivishell *shell = ivisurf->shell; - - ans = ivi_extension_get_layers_under_surface(shell, ivisurf->layout_surface, - &length, &pArray); - if (0 != ans) { - weston_log("failed to get layers at send_surface_add_event\n"); - return; - } - - if (mask & IVI_NOTIFICATION_REMOVE) { - ivisurf->on_layer = NULL; - } - if (mask & IVI_NOTIFICATION_ADD) { - for (i = 0; i < (int)length; ++i) { - /* Create list_layer */ - struct ivilayer *ivilayer = NULL; - - wl_list_for_each(ivilayer, &shell->list_layer, link) { - if (ivilayer->layout_layer == pArray[i]) { - break; - } - } - - ivisurf->on_layer = ivilayer; - } - } - - free(pArray); - pArray = NULL; -} - static void send_surface_prop(struct ivi_layout_surface *layout_surface, const struct ivi_layout_surface_properties *prop, @@ -304,8 +264,6 @@ send_surface_prop(struct ivi_layout_surface *layout_surface, wl_resource_for_each(resource, &ivisurf->resource_list) { send_surface_event(resource, ivisurf, prop, mask); } - - update_surface_prop(ivisurf, mask); } static void -- cgit v1.2.1