1 files changed, 24 insertions, 22 deletions

diff --git a/src/plugins/platforms/wasm/qwasmintegration.h b/src/plugins/platforms/wasm/qwasmintegration.h
index d996ec3065..870bd0d16b 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.h
+++ b/src/plugins/platforms/wasm/qwasmintegration.h
@@ -6,23 +6,20 @@
 
 #include "qwasmwindow.h"
 
+#include "qwasminputcontext.h"
+
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformscreen.h>
 #include <qpa/qplatforminputcontext.h>
 
 #include <QtCore/qhash.h>
 
+#include <private/qstdweb_p.h>
+
 #include <emscripten.h>
 #include <emscripten/html5.h>
 #include <emscripten/val.h>
 
-#include "qwasminputcontext.h"
-#include <private/qstdweb_p.h>
-
-#if QT_CONFIG(draganddrop)
-#include "qwasmdrag.h"
-#endif
-
 QT_BEGIN_NAMESPACE
 
 class QWasmEventTranslator;
@@ -33,21 +30,14 @@ class QWasmScreen;
 class QWasmCompositor;
 class QWasmBackingStore;
 class QWasmClipboard;
+class QWasmAccessibility;
 class QWasmServices;
+class QWasmDrag;
 
 class QWasmIntegration : public QObject, public QPlatformIntegration
 {
     Q_OBJECT
 public:
-    enum Platform {
-        GenericPlatform,
-        MacOSPlatform,
-        WindowsPlatform,
-        LinuxPlatform,
-        AndroidPlatform,
-        iPhonePlatform
-    };
-
     QWasmIntegration();
     ~QWasmIntegration();
 
@@ -66,6 +56,9 @@ public:
     QPlatformTheme *createPlatformTheme(const QString &name) const override;
     QPlatformServices *services() const override;
     QPlatformClipboard *clipboard() const override;
+#ifndef QT_NO_ACCESSIBILITY
+    QPlatformAccessibility *accessibility() const override;
+#endif
     void initialize() override;
     QPlatformInputContext *inputContext() const override;
 
@@ -77,23 +70,32 @@ public:
     QWasmInputContext *getWasmInputContext() { return m_platformInputContext; }
     static QWasmIntegration *get() { return s_instance; }
 
-    void addScreen(const emscripten::val &canvas);
-    void removeScreen(const emscripten::val &canvas);
+    void setContainerElements(emscripten::val elementArray);
+    void addContainerElement(emscripten::val elementArray);
+    void removeContainerElement(emscripten::val elementArray);
     void resizeScreen(const emscripten::val &canvas);
-    void resizeAllScreens();
     void updateDpi();
+    void resizeAllScreens();
+    void loadLocalFontFamilies(emscripten::val families);
     void removeBackingStore(QWindow* window);
+    void releaseRequesetUpdateHold();
     static quint64 getTimestamp();
 
-    Platform platform;
     int touchPoints;
 
 private:
+    struct ScreenMapping {
+        emscripten::val emscriptenVal;
+        QWasmScreen *wasmScreen;
+    };
+
     mutable QWasmFontDatabase *m_fontDb;
     mutable QWasmServices *m_desktopServices;
     mutable QHash<QWindow *, QWasmBackingStore *> m_backingStores;
-    QList<QPair<emscripten::val, QWasmScreen *>> m_screens;
+    QList<ScreenMapping> m_screens;
     mutable QWasmClipboard *m_clipboard;
+    mutable QWasmAccessibility *m_accessibility;
+
     qreal m_fontDpi = -1;
     mutable QScopedPointer<QPlatformInputContext> m_inputContext;
     static QWasmIntegration *s_instance;
@@ -101,7 +103,7 @@ private:
     mutable QWasmInputContext *m_platformInputContext = nullptr;
 
 #if QT_CONFIG(draganddrop)
-    QWasmDrag *m_drag;
+    std::unique_ptr<QWasmDrag> m_drag;
 #endif
 
 };