diff options
| author | Simon Ser <contact@emersion.fr> | 2021-10-27 15:42:08 +0200 |
|---|---|---|
| committer | Isaac Freund <mail@isaacfreund.com> | 2021-10-27 16:18:10 +0200 |
| commit | a80f2b281640b6fcf092d29e41ea7747b6c66328 (patch) | |
| tree | 8395d1ba67fcbbb3006877456c020cdf09939a28 | |
| parent | a92293a15a9ace8abca2a3e3f785ab816f62be42 (diff) | |
scene: inline subsurface_tree_destroy
This is only called from one function.
To destroy the wlr_scene_subsurface_tree from elsewhere, callers
can destroy the scene-graph node returned by
wlr_scene_subsurface_tree_create instead (just like a compositor
would do). subsurface_tree_handle_surface_destroy does exactly this.
Inlining avoids calling subsurface_tree_destroy by mistake.
| -rw-r--r-- | types/scene/subsurface_tree.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/types/scene/subsurface_tree.c b/types/scene/subsurface_tree.c index 7cfa8828..cd8d23dc 100644 --- a/types/scene/subsurface_tree.c +++ b/types/scene/subsurface_tree.c @@ -22,7 +22,10 @@ struct wlr_scene_subsurface_tree { struct wl_listener surface_new_subsurface; }; -static void subsurface_tree_destroy(struct wlr_scene_subsurface_tree *subsurface_tree) { +static void subsurface_tree_handle_tree_destroy(struct wl_listener *listener, + void *data) { + struct wlr_scene_subsurface_tree *subsurface_tree = + wl_container_of(listener, subsurface_tree, tree_destroy); // tree and scene_surface will be cleaned up by scene_node_finish if (subsurface_tree->parent) { wlr_addon_finish(&subsurface_tree->surface_addon); @@ -34,13 +37,6 @@ static void subsurface_tree_destroy(struct wlr_scene_subsurface_tree *subsurface free(subsurface_tree); } -static void subsurface_tree_handle_tree_destroy(struct wl_listener *listener, - void *data) { - struct wlr_scene_subsurface_tree *subsurface_tree = - wl_container_of(listener, subsurface_tree, tree_destroy); - subsurface_tree_destroy(subsurface_tree); -} - static void subsurface_tree_handle_surface_destroy(struct wl_listener *listener, void *data) { struct wlr_scene_subsurface_tree *subsurface_tree = |