Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	src/client/qwaylanddisplay.cpp
	src/client/qwaylandwindow.cpp

Change-Id: I30ddf5305b3087b93cf4d6e562fd0146dea61cc0

1 files changed, 41 insertions, 0 deletions

diff --git a/tests/auto/client/surface/tst_surface.cpp b/tests/auto/client/surface/tst_surface.cpp
index 9659235a0..b8a65f159 100644
--- a/tests/auto/client/surface/tst_surface.cpp
+++ b/tests/auto/client/surface/tst_surface.cpp
@@ -45,6 +45,10 @@ private slots:
     void waitForFrameCallbackGl();
 #endif
     void negotiateShmFormat();
+
+    // Subsurfaces
+    void createSubsurface();
+    void createSubsurfaceForHiddenParent();
 };
 
 void tst_surface::createDestroySurface()
@@ -160,5 +164,42 @@ void tst_surface::negotiateShmFormat()
     });
 }
 
+void tst_surface::createSubsurface()
+{
+    QRasterWindow window;
+    window.resize(64, 64);
+    window.show();
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+    exec([=] { xdgToplevel()->sendCompleteConfigure(); });
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface()->m_committedConfigureSerial);
+
+    QRasterWindow subWindow;
+    subWindow.setParent(&window);
+    subWindow.resize(64, 64);
+    subWindow.show();
+    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"