[mutter/gnome-41] wayland/surface: Ensure to apply cached state

[Robert Mader <rmader src gnome org>]

commit 2405c3b3be7e722022554fd032f30dc3918374d5
Author: Robert Mader <robert mader collabora com>
Date:   Mon Jan 10 19:30:16 2022 +0100

    wayland/surface: Ensure to apply cached state
    
    It is possible that we never create a cached state for a surface
    even if it is synced. That is the case if `commit()` is never called.
    We still need to call `apply_state()` in this case in order to run
    e.g. `role_post_apply_state()` or `parent_state_applied` on subsurfaces.
    
    So just ensure to initialize the cached state instead of bailing out.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2232>
    
    (cherry picked from commit e3f0efa065d7263e26d5817aceb480e017ef6a75)

 src/wayland/meta-wayland-surface.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 3802ae2986..871aded3ae 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -949,9 +949,7 @@ cleanup:
 void
 meta_wayland_surface_apply_cached_state (MetaWaylandSurface *surface)
 {
-  if (!surface->cached_state)
-    return;
-
+  meta_wayland_surface_ensure_cached_state (surface);
   meta_wayland_surface_apply_state (surface, surface->cached_state);
 }