1780389 - Avoid deadlock in moz_container_wayland_add_initial_draw_callback()

Status: RESOLVED FIXED

(Core :: Widget: Gtk, defect, P3)

Description

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

See https://bugzilla.mozilla.org/show_bug.cgi?id=1780190#c1
moz_container_wayland_add_initial_draw_callback() can cause deadlock.

Comment 1

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

Attachment: Bug 1780389 [Wayland] Implement RAII class MozContainerSurfaceLock to get&lock wl_surface of moz_container r?emilio

With this patch moz_container_wayland_surface_lock() always locks MozContainer and needs to be paired with moz_container_wayland_surface_unlock() even if it fails and returns nullptr.
Split moz_container_wayland_add_initial_draw_callback() to two new functions:

• moz_container_wayland_add_initial_draw_callback_locked() is called on locked container and only adds draw callback.
  It asserts when MozContainer is already to draw as we don't expect it.

• moz_container_wayland_add_or_fire_initial_draw_callback() is called on unlocked container as it has it's own lock.
  It behaves as original moz_container_wayland_add_initial_draw_callback(), i.e. stores draw callback when MosContainer is not visible
  and fires draw callback when we're ready to draw.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d2c2f810bf14
[Wayland] Call moz_container_wayland_add_initial_draw_callback() on locked container, always lock MozContainer for access r=rmader

Comment 3

[Marian-Vasile Laza]

https://hg.mozilla.org/mozilla-central/rev/d2c2f810bf14

Comment 4

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/mozilla-central/rev/856755f2ddc6
Backed out changeset d2c2f810bf14 for causing Bug 1780679 a=backout

Comment 5

[Cristian Tuns]

Backed out for causing causing Bug 1780679

• Backout link

Comment 6

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=5e0f54be05d610cdc8a335af40398b37370ec5f9

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/e4b5b93592b0
[Wayland] Implement RAII class MozContainerSurfaceLock to get&lock wl_surface of moz_container r=rmader

Comment 8

[Norisz Fay [:noriszfay]]

Backed out for causing build bustages on MozContainerWayland.h

Backout link

Push with failures

Failure log

Comment 9

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

Updated, Thanks.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/26adc3b79354
[Wayland] Implement RAII class MozContainerSurfaceLock to get&lock wl_surface of moz_container r=rmader

Comment 11

[Cristian Tuns]

https://hg.mozilla.org/mozilla-central/rev/26adc3b79354

Comment 12

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

Failed to land.

Comment 13

[Martin Stránský [:stransky] (ni? me) (PTO, back on Feb 17)]

Okay, looks fixed.