wasm: fix onLoaded delay functionality

onLoaded and the initial expose/paint should be sequenced
such that onLoaded is fired first, followed by the expose.
This makes sure that we don't spend any time on painting
frames before Qt is completely initialized.

Add a "requestUpdateHold" mode to QWasmCompositor (initially
on) which disables requestUpdate calls, as well
as releaseRequestUpdateHold() which enables requestUpdate
calls again. This is a one-way transition; the mode
can't be enabled again.

This amends commit f2e22774 which implemented the concept
of startup tasks, where onLoaded can be delayed until
for instance font loading has been completed. After
this commit the expose event and initial commit will
be delayed as well.

Change-Id: Icc784306726174fbabe8785d54485860e968745a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>

6 files changed, 44 insertions, 1 deletions

diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 66eaea62fa..48445d5db9 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -4,6 +4,8 @@
 #include "qwasmcompositor.h"
 #include "qwasmwindow.h"
 
+#include <private/qeventdispatcher_wasm_p.h>
+
 #include <qpa/qwindowsysteminterface.h>
 
 #include <emscripten/html5.h>
@@ -41,6 +43,17 @@ void QWasmCompositor::setEnabled(bool enabled)
     m_isEnabled = enabled;
 }
 
+// requestUpdate delivery is initially disabled at startup, while Qt completes
+// startup tasks such as font loading. This function enables requestUpdate delivery
+// again.
+void QWasmCompositor::releaseRequesetUpdateHold()
+{
+    if (!m_requestUpdateHoldEnabled)
+        return;
+    m_requestUpdateHoldEnabled = false;
+    requestUpdate();
+}
+
 void QWasmCompositor::requestUpdateWindow(QWasmWindow *window, UpdateRequestDeliveryType updateType)
 {
     auto it = m_requestUpdateWindows.find(window);
@@ -62,6 +75,9 @@ void QWasmCompositor::requestUpdate()
     if (m_requestAnimationFrameId != -1)
         return;
 
+    if (m_requestUpdateHoldEnabled)
+        return;
+
     static auto frame = [](double frameTime, void *context) -> int {
         Q_UNUSED(frameTime);
 
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index 182ea2b167..5de401844c 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -31,8 +31,8 @@ public:
     QWasmScreen *screen();
     void setEnabled(bool enabled);
 
+    void releaseRequesetUpdateHold();
     enum UpdateRequestDeliveryType { ExposeEventDelivery, UpdateRequestDelivery };
-
     void requestUpdateWindow(QWasmWindow *window, UpdateRequestDeliveryType updateType = ExposeEventDelivery);
 
     void handleBackingStoreFlush(QWindow *window);
@@ -50,6 +50,7 @@ private:
     bool m_isEnabled = true;
     QMap<QWasmWindow *, UpdateRequestDeliveryType> m_requestUpdateWindows;
     int m_requestAnimationFrameId = -1;
+    bool m_requestUpdateHoldEnabled = true;
     bool m_inDeliverUpdateRequest = false;
 };
 
diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
index cd2cefc14d..1f2d3095d6 100644
--- a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "qwasmeventdispatcher.h"
+#include "qwasmintegration.h"
 
 #include <QtGui/qpa/qwindowsysteminterface.h>
 
@@ -15,4 +16,20 @@ bool QWasmEventDispatcher::processPostedEvents()
     return QWindowSystemInterface::sendWindowSystemEvents(QEventLoop::AllEvents);
 }
 
+void QWasmEventDispatcher::onLoaded()
+{
+    // This function is called when the application is ready to paint
+    // the first frame. Send the qtlaoder onLoaded event first (via
+    // the base class implementation), and then enable/call requestUpdate
+    // to deliver a frame.
+    QEventDispatcherWasm::onLoaded();
+
+    // Make sure all screens have a defined size; and pick
+    // up size changes due to onLoaded event handling.
+    QWasmIntegration *wasmIntegration = QWasmIntegration::get();
+    wasmIntegration->resizeAllScreens();
+
+    wasmIntegration->releaseRequesetUpdateHold();
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.h b/src/plugins/platforms/wasm/qwasmeventdispatcher.h
index 33d672a57f..cbf10482e3 100644
--- a/src/plugins/platforms/wasm/qwasmeventdispatcher.h
+++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.h
@@ -12,6 +12,7 @@ class QWasmEventDispatcher : public QEventDispatcherWasm
 {
 protected:
     bool processPostedEvents() override;
+    void onLoaded() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index c665251d0d..d2e7c8716c 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -206,6 +206,13 @@ void QWasmIntegration::removeBackingStore(QWindow* window)
     m_backingStores.remove(window);
 }
 
+void QWasmIntegration::releaseRequesetUpdateHold()
+{
+    for (const auto &elementAndScreen : m_screens) {
+        elementAndScreen.wasmScreen->compositor()->releaseRequesetUpdateHold();
+    }
+}
+
 #ifndef QT_NO_OPENGL
 QPlatformOpenGLContext *QWasmIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
diff --git a/src/plugins/platforms/wasm/qwasmintegration.h b/src/plugins/platforms/wasm/qwasmintegration.h
index eeb68109a0..870bd0d16b 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.h
+++ b/src/plugins/platforms/wasm/qwasmintegration.h
@@ -78,6 +78,7 @@ public:
     void resizeAllScreens();
     void loadLocalFontFamilies(emscripten::val families);
     void removeBackingStore(QWindow* window);
+    void releaseRequesetUpdateHold();
     static quint64 getTimestamp();
 
     int touchPoints;