Merge branch 'nc/abandon-frame': discard late frame callbacks after close

commit: 8d3babab3fba88d361d2cb638c605e7b63a435ee
author: brice · 21d ago · 2026-10-01 18:59 UTC
merge of: 0e97e81 + 98001e2 · diff against the first parent
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +6 -8

M surface.go +4 -4


@@ -724,9 +724,6 @@ func (s *Surface) Close() error {
724	724		}
725	725
726	726		func (s *Surface) destroy() error {
727		-	// TODO(wlturbo): a frame callback pending here is unregistered locally, so
728		-	// its later done/delete_id reaches an unknown object. Fixing it needs
729		-	// server-side delete_id handling in wlturbo (see TestCloseWithPendingFrame).
730	727		s.closed = true
731	728		delete(s.c.surfaces, s.id)
732	729		s.c.seatSurfaceGone(s)

@@ -772,7 +769,10 @@ func (s *Surface) destroy() error {
772	769		add(s.surf.Destroy())
773	770		}
774	771		if s.cb != nil {
775		-	s.c.wlctx.Unregister(s.cb)
	772	+	// A pending frame callback is owned by the compositor: abandon it so
	773	+	// its late done and delete_id are discarded. An error only means no
	774	+	// callback was pending.
	775	+	_ = s.c.wlctx.Abandon(s.cb)
776	776		}
777	777		return errors.Join(errs...)
778	778		}

 }
 func (s *Surface) destroy() error {
-	// TODO(wlturbo): a frame callback pending here is unregistered locally, so
-	// its later done/delete_id reaches an unknown object. Fixing it needs
-	// server-side delete_id handling in wlturbo (see TestCloseWithPendingFrame).
 	s.closed = true
 	delete(s.c.surfaces, s.id)
 	s.c.seatSurfaceGone(s)
 		add(s.surf.Destroy())
 	}
 	if s.cb != nil {
-		s.c.wlctx.Unregister(s.cb)
+		// A pending frame callback is owned by the compositor: abandon it so
+		// its late done and delete_id are discarded. An error only means no
+		// callback was pending.
+		_ = s.c.wlctx.Abandon(s.cb)
 	}
 	return errors.Join(errs...)
 }

M surface_wire_test.go +2 -4


@@ -164,11 +164,9 @@ func TestLockCloseDestroysUnlockedLock(t *testing.T) {
164	164		require.NoError(t, l.Close(), "idempotent")
165	165		}
166	166
167		-	// GO-002 reproduction, enabled once wlturbo handles delete_id for objects the
168		-	// server creates: closing a surface with a pending frame callback must not turn
169		-	// the compositor's later callback done and delete_id into a transport error.
	167	+	// Closing a surface with a pending frame callback must not turn the
	168	+	// compositor's later callback done and delete_id into a transport error.
170	169		func TestCloseWithPendingFrame(t *testing.T) {
171		-	t.Skip("needs wlturbo server-side delete_id handling")
172	170		c, srv := connectWire(t, surfaceGlobals, surfaceOutputs)
173	171		s, err := c.NewToplevel("close", 64, 48)
174	172		require.NoError(t, err)

 	require.NoError(t, l.Close(), "idempotent")
 }
-// GO-002 reproduction, enabled once wlturbo handles delete_id for objects the
+// Closing a surface with a pending frame callback must not turn the
-// server creates: closing a surface with a pending frame callback must not turn
+// compositor's later callback done and delete_id into a transport error.
-// the compositor's later callback done and delete_id into a transport error.
 func TestCloseWithPendingFrame(t *testing.T) {
-	t.Skip("needs wlturbo server-side delete_id handling")
 	c, srv := connectWire(t, surfaceGlobals, surfaceOutputs)
 	s, err := c.NewToplevel("close", 64, 48)
 	require.NoError(t, err)