From 41216bedd4a5eba1b12dacdad2c6368ac8978c77 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 1 Nov 2019 10:16:43 +0100
Subject: [PATCH] Add client test for subsurface with hidden parent

Task-number: QTBUG-79674
Change-Id: I451ee4423dee511f41070498a61167912920c086
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 tests/auto/wayland/surface/tst_surface.cpp | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/auto/wayland/surface/tst_surface.cpp b/tests/auto/wayland/surface/tst_surface.cpp
index 451fbac75b6..f9dcec58117 100644
--- a/tests/auto/wayland/surface/tst_surface.cpp
+++ b/tests/auto/wayland/surface/tst_surface.cpp
@@ -42,7 +42,9 @@ private slots:
     void waitForFrameCallbackGl();
     void negotiateShmFormat();
 
+    // Subsurfaces
     void createSubsurface();
+    void createSubsurfaceForHiddenParent();
 };
 
 void tst_surface::createDestroySurface()
@@ -172,5 +174,26 @@ void tst_surface::createSubsurface()
     QCOMPOSITOR_TRY_VERIFY(subSurface());
 }
 
+// Used to cause a crash in libwayland (QTBUG-79674)
+void tst_surface::createSubsurfaceForHiddenParent()
+{
+    QRasterWindow window;
+    window.resize(64, 64);
+    window.show();
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+    exec([=] { xdgToplevel()->sendCompleteConfigure(); });
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface()->m_committedConfigureSerial);
+
+    window.hide();
+
+    QRasterWindow subWindow;
+    subWindow.setParent(&window);
+    subWindow.resize(64, 64);
+    subWindow.show();
+
+    // Make sure the client doesn't quit before it has a chance to crash
+    xdgPingAndWaitForPong();
+}
+
 QCOMPOSITOR_TEST_MAIN(tst_surface)
 #include "tst_surface.moc"