From 83a00087178376b898995ee00a948010cb11eef8 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 30 Jul 2024 15:40:30 +0900 Subject: [PATCH] e_compositor: Remove obsolete function Change-Id: I1adb7b44b5747c0005811f37b6bd9c7e8a2b50cd --- src/bin/server/e_compositor.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c index 49e7e1c..1423f61 100644 --- a/src/bin/server/e_compositor.c +++ b/src/bin/server/e_compositor.c @@ -101,7 +101,6 @@ static void _e_compositor_cb_new_client(void *data EINA_UNUSED, E_Client *ec); static E_Surface *_e_surface_create(E_Client *ec); static E_Surface *_e_surface_from_ds_surface(struct ds_surface *ds_surface); -static E_Surface *_e_surface_from_comp_data(E_Comp_Wl_Client_Data *comp_data); static void _e_surface_destroy(E_Surface *surface); static void _e_surface_ds_surface_set(E_Surface *surface, struct ds_surface *ds_surface); static void _e_surface_cb_client_del(void *data, E_Client *ec); @@ -309,7 +308,7 @@ e_comp_wl_subsurface_commit(E_Client *ec) if (e_object_is_del(E_OBJECT(ec)) || !ec->comp_data) return EINA_FALSE; - surface = _e_surface_from_comp_data(ec->comp_data); + surface = e_surface_from_ec(ec); sub = _e_subsurface_from_surface(surface); if (!sub) return EINA_FALSE; @@ -778,8 +777,7 @@ _e_compositor_cb_new_surface(struct wl_listener *listener, void *data) ec->icccm.accepts_focus = 1; wl_list_init(&ec->comp_data->pointer_constraints); - _e_surface_ds_surface_set(_e_surface_from_comp_data(ec->comp_data), - ds_surface); + _e_surface_ds_surface_set(e_surface_from_ec(ec), ds_surface); } DBG("\tUsing Client: %p", ec); @@ -987,13 +985,6 @@ _e_surface_from_ds_surface(struct ds_surface *ds_surface) } static E_Surface * -_e_surface_from_comp_data(E_Comp_Wl_Client_Data *comp_data) -{ - E_Surface *surface; - return wl_container_of(comp_data, surface, base); -} - -static E_Surface * _e_surface_root_surface_get(E_Surface *surface) { E_Surface *iter = surface; -- 2.7.4