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

wasm: fix specialHtmlTargets code

Browse Source 
Remove .as_handle() call, which was left over from the previous
EM_ASM-based code; see 0ec75f4b9.

Change-Id: I220304074f4d17e706726dab086c0330edc9ef25
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Morten Sørvig 2022-05-12 15:41:25 +02:00 committed by Morten Johan Sørvig
parent f4e9981259
commit 250f5f4a11
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ QWasmScreen::QWasmScreen(const emscripten::val &containerOrCanvas)
m_onContextMenu = std::make_unique<qstdweb::EventCallback>(m_canvas, "contextmenu", [](emscripten::val event){
event.call<void>("preventDefault");
});
// Create "specialHTMLTargets" mapping for the canvas. Normally, Emscripten
// uses the html element id when targeting elements, for example when registering
// event callbacks. However, this approach is limited to supporting single-document
@ -105,9 +105,8 @@ QWasmScreen::QWasmScreen(const emscripten::val &containerOrCanvas)
// As a workaround for this, Emscripten supports registering custom mappings in the
// "specialHTMLTargets" object. Add a mapping for the canvas for this screen.
emscripten::val specialHtmlTargets = emscripten::val::module_property("specialHTMLTargets");
std::string id = std::string("!qtcanvas_") + std::to_string(uint32_t(this));
specialHtmlTargets.set(id, m_canvas.as_handle());
specialHtmlTargets.set(id, m_canvas);
// Install event handlers on the container/canvas. This must be
// done after the canvas has been created above.