1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return to the two-step destruction in compositor

Browse Source 
The two-step destruction we used to employ is needed as destroying
a screen which contains a window crashes.

Change-Id: I722828be5408a7f079d66e845eeee34ed19cbf34
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
(cherry picked from commit 644036b597137306959d875127cc819612ee9217)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mikolaj Boc 2022-12-28 15:46:08 +01:00
parent 33895a9b6d
commit c613c5ce22
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wasm/qwasmcompositor.cpp
View File

@ -65,10 +65,14 @@ QWasmCompositor::~QWasmCompositor()
if (m_requestAnimationFrameId != -1) if (m_requestAnimationFrameId != -1)
emscripten_cancel_animation_frame(m_requestAnimationFrameId); emscripten_cancel_animation_frame(m_requestAnimationFrameId);
deregisterEventHandlers();
destroy(); destroy();
} }
void QWasmCompositor::onScreenDeleting()
{
deregisterEventHandlers();
}
void QWasmCompositor::deregisterEventHandlers() void QWasmCompositor::deregisterEventHandlers()
{ {
QByteArray screenElementSelector = screen()->eventTargetId().toUtf8(); QByteArray screenElementSelector = screen()->eventTargetId().toUtf8();

2
src/plugins/platforms/wasm/qwasmcompositor.h
View File

@ -50,6 +50,8 @@ public:
void raise(QWasmWindow *window); void raise(QWasmWindow *window);
void lower(QWasmWindow *window); void lower(QWasmWindow *window);
void onScreenDeleting();
QWindow *windowAt(QPoint globalPoint, int padding = 0) const; QWindow *windowAt(QPoint globalPoint, int padding = 0) const;
QWindow *keyWindow() const; QWindow *keyWindow() const;

6
src/plugins/platforms/wasm/qwasmscreen.cpp
View File

@ -92,8 +92,6 @@ QWasmScreen::QWasmScreen(const emscripten::val &containerOrCanvas)
QWasmScreen::~QWasmScreen() QWasmScreen::~QWasmScreen()
{ {
Q_ASSERT(!m_compositor); // deleteScreen should have been called to remove this screen
emscripten::val::module_property("specialHTMLTargets") emscripten::val::module_property("specialHTMLTargets")
.set(eventTargetId().toStdString(), emscripten::val::undefined()); .set(eventTargetId().toStdString(), emscripten::val::undefined());
@ -103,9 +101,7 @@ QWasmScreen::~QWasmScreen()
void QWasmScreen::deleteScreen() void QWasmScreen::deleteScreen()
{ {
// Delete the compositor before removing the screen, since its destruction routine needs to use m_compositor->onScreenDeleting();
// the fully operational screen.
m_compositor.reset();
// Deletes |this|! // Deletes |this|!
QWindowSystemInterface::handleScreenRemoved(this); QWindowSystemInterface::handleScreenRemoved(this);
} }