From e7d589d45b855632303894e1fb21bc6e80fa8f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 25 May 2021 15:55:16 +0200 Subject: [PATCH] wayland/surface: Move out meta_wayland_surface_state_reset calls From meta_wayland_surface_apply_state / _state_merge_into to their callers. Preparation for changing behaviour in the callers, no functional change intended. Part-of: --- src/wayland/meta-wayland-surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 4629ff81e..7b3a02ad4 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -666,8 +666,6 @@ meta_wayland_surface_state_merge_into (MetaWaylandSurfaceState *from, wl_list_insert_list (&to->presentation_feedback_list, &from->presentation_feedback_list); wl_list_init (&from->presentation_feedback_list); - - meta_wayland_surface_state_reset (from); } static void @@ -981,8 +979,6 @@ cleanup: if (surface->role) meta_wayland_surface_role_post_apply_state (surface->role, state); - - meta_wayland_surface_state_reset (state); } static void @@ -998,6 +994,7 @@ meta_wayland_surface_apply_cached_state (MetaWaylandSurface *surface) { ensure_cached_state (surface); meta_wayland_surface_apply_state (surface, surface->cached_state); + meta_wayland_surface_state_reset (surface->cached_state); } MetaWaylandSurfaceState * @@ -1036,6 +1033,8 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface) { meta_wayland_surface_apply_state (surface, surface->pending_state); } + + meta_wayland_surface_state_reset (pending); } static void