brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/surface: Move out meta_wayland_surface_state_reset calls

Browse Source 
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880>
This commit is contained in:
Michel Dänzer 2021-05-25 15:55:16 +02:00 committed by Michel Dänzer
parent 854c02651f
commit e7d589d45b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wayland/meta-wayland-surface.c
View File

@ -666,8 +666,6 @@ meta_wayland_surface_state_merge_into (MetaWaylandSurfaceState *from,
wl_list_insert_list (&to->presentation_feedback_list, wl_list_insert_list (&to->presentation_feedback_list,
&from->presentation_feedback_list); &from->presentation_feedback_list);
wl_list_init (&from->presentation_feedback_list); wl_list_init (&from->presentation_feedback_list);
meta_wayland_surface_state_reset (from);
} }
static void static void
@ -981,8 +979,6 @@ cleanup:
if (surface->role) if (surface->role)
meta_wayland_surface_role_post_apply_state (surface->role, state); meta_wayland_surface_role_post_apply_state (surface->role, state);
meta_wayland_surface_state_reset (state);
} }
static void static void
@ -998,6 +994,7 @@ meta_wayland_surface_apply_cached_state (MetaWaylandSurface *surface)
{ {
ensure_cached_state (surface); ensure_cached_state (surface);
meta_wayland_surface_apply_state (surface, surface->cached_state); meta_wayland_surface_apply_state (surface, surface->cached_state);
meta_wayland_surface_state_reset (surface->cached_state);
} }
MetaWaylandSurfaceState * MetaWaylandSurfaceState *
@ -1036,6 +1033,8 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
{ {
meta_wayland_surface_apply_state (surface, surface->pending_state); meta_wayland_surface_apply_state (surface, surface->pending_state);
} }
meta_wayland_surface_state_reset (pending);
} }
static void static void