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

wasm: don’t leak QWasmScreen member variables

Browse Source 
m_compositor and m_eventTranslator are owned by the
screen object and can be held in a unique_ptr.

Pick-to: 6.2
Change-Id: I7d5e19e7ac6f762f360d6af0fc9500e6964f737e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Morten Sørvig 2021-05-26 12:16:56 +02:00 committed by Morten Johan Sørvig
parent a6bd2da2ab
commit 0ca0f3e7fe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,9 @@ const char * QWasmScreen::m_canvasResizeObserverCallbackContextPropertyName = "d
QWasmScreen::QWasmScreen(const emscripten::val &canvas) QWasmScreen::QWasmScreen(const emscripten::val &canvas)
: m_canvas(canvas) : m_canvas(canvas)
, m_compositor(new QWasmCompositor(this))
, m_eventTranslator(new QWasmEventTranslator(this))
{ {
m_compositor = new QWasmCompositor(this);
m_eventTranslator = new QWasmEventTranslator(this);
updateQScreenAndCanvasRenderSize(); updateQScreenAndCanvasRenderSize();
m_canvas.call<void>("focus"); m_canvas.call<void>("focus");
} }
@ -84,12 +84,12 @@ QWasmScreen *QWasmScreen::get(QScreen *screen)
QWasmCompositor *QWasmScreen::compositor() QWasmCompositor *QWasmScreen::compositor()
{ {
return m_compositor; return m_compositor.get();
} }
QWasmEventTranslator *QWasmScreen::eventTranslator() QWasmEventTranslator *QWasmScreen::eventTranslator()
{ {
return m_eventTranslator; return m_eventTranslator.get();
} }
emscripten::val QWasmScreen::canvas() const emscripten::val QWasmScreen::canvas() const

4
src/plugins/platforms/wasm/qwasmscreen.h
View File

@ -86,8 +86,8 @@ public slots:
private: private:
emscripten::val m_canvas; emscripten::val m_canvas;
QWasmCompositor *m_compositor = nullptr; std::unique_ptr<QWasmCompositor> m_compositor;
QWasmEventTranslator *m_eventTranslator = nullptr; std::unique_ptr<QWasmEventTranslator> m_eventTranslator;
QRect m_geometry = QRect(0, 0, 100, 100); QRect m_geometry = QRect(0, 0, 100, 100);
int m_depth = 32; int m_depth = 32;
QImage::Format m_format = QImage::Format_RGB32; QImage::Format m_format = QImage::Format_RGB32;