1 files changed, 30 insertions, 11 deletions

diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h
index 661a5160e8..ab0dc68e83 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.h
+++ b/src/plugins/platforms/wasm/qwasmwindow.h
@@ -6,11 +6,14 @@
 
 #include "qwasmintegration.h"
 #include <qpa/qplatformwindow.h>
+#include <qpa/qplatformwindow_p.h>
 #include <emscripten/html5.h>
 #include "qwasmbackingstore.h"
 #include "qwasmscreen.h"
 #include "qwasmcompositor.h"
 #include "qwasmwindownonclientarea.h"
+#include "qwasmwindowstack.h"
+#include "qwasmwindowtreenode.h"
 
 #include <QtCore/private/qstdweb_p.h>
 #include "QtGui/qopenglcontext.h"
@@ -23,28 +26,27 @@
 QT_BEGIN_NAMESPACE
 
 namespace qstdweb {
-struct CancellationFlag;
-}
-
-namespace qstdweb {
 class EventCallback;
 }
 
 class ClientArea;
-struct DragEvent;
 struct KeyEvent;
 struct PointerEvent;
 class QWasmDeadKeySupport;
 struct WheelEvent;
 
-class QWasmWindow final : public QPlatformWindow
+class QWasmWindow final : public QPlatformWindow,
+                          public QWasmWindowTreeNode,
+                          public QNativeInterface::Private::QWasmWindow
 {
 public:
     QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport, QWasmCompositor *compositor,
                 QWasmBackingStore *backingStore);
     ~QWasmWindow() final;
 
-    void destroy();
+    static QWasmWindow *fromWindow(QWindow *window);
+    QSurfaceFormat format() const override;
+
     void paint();
     void setZOrder(int order);
     void setWindowCursor(QByteArray cssCursorName);
@@ -80,6 +82,7 @@ public:
     bool setMouseGrabEnabled(bool grab) final;
     bool windowEvent(QEvent *event) final;
     void setMask(const QRegion &region) final;
+    void setParent(const QPlatformWindow *window) final;
 
     QWasmScreen *platformScreen() const;
     void setBackingStore(QWasmBackingStore *store) { m_backingStore = store; }
@@ -87,23 +90,39 @@ public:
     QWindow *window() const { return m_window; }
 
     std::string canvasSelector() const;
+
     emscripten::val context2d() const { return m_context2d; }
     emscripten::val a11yContainer() const { return m_a11yContainer; }
     emscripten::val inputHandlerElement() const { return m_windowContents; }
 
+    // QNativeInterface::Private::QWasmWindow
+    emscripten::val document() const override { return m_document; }
+    emscripten::val clientArea() const override { return m_qtWindow; }
+
+    // QWasmWindowTreeNode:
+    emscripten::val containerElement() final;
+    QWasmWindowTreeNode *parentNode() final;
+
 private:
     friend class QWasmScreen;
-    static constexpr auto minSizeForRegularWindows = 100;
+    static constexpr auto defaultWindowSize = 160;
+
+    // QWasmWindowTreeNode:
+    QWasmWindow *asWasmWindow() final;
+    void onParentChanged(QWasmWindowTreeNode *previous, QWasmWindowTreeNode *current,
+                         QWasmWindowStack::PositionPreference positionPreference) final;
 
     void invalidate();
+    bool hasFrame() const;
+    bool hasTitleBar() const;
     bool hasBorder() const;
     bool hasShadow() const;
     bool hasMaximizeButton() const;
     void applyWindowState();
+    void commitParent(QWasmWindowTreeNode *parent);
 
     bool processKey(const KeyEvent &event);
     bool processPointer(const PointerEvent &event);
-    bool processDrop(const DragEvent &event);
     bool processWheel(const WheelEvent &event);
 
     QWindow *m_window = nullptr;
@@ -123,6 +142,8 @@ private:
     std::unique_ptr<NonClientArea> m_nonClientArea;
     std::unique_ptr<ClientArea> m_clientArea;
 
+    QWasmWindowTreeNode *m_commitedParent = nullptr;
+
     std::unique_ptr<qstdweb::EventCallback> m_keyDownCallback;
     std::unique_ptr<qstdweb::EventCallback> m_keyUpCallback;
 
@@ -148,8 +169,6 @@ private:
     friend class QWasmCompositor;
     friend class QWasmEventTranslator;
     bool windowIsPopupType(Qt::WindowFlags flags) const;
-
-    std::shared_ptr<qstdweb::CancellationFlag> m_dropDataReadCancellationFlag;
 };
 
 QT_END_NAMESPACE