Skip to content

Prevent transferredCanvasNames is not iterable (fixes #17751) #17752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 7, 2022
Merged

Prevent transferredCanvasNames is not iterable (fixes #17751) #17752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7421d3
Prevent transferredCanvasNames is not iterable (partially reverts #17…
boardend Aug 29, 2022
b5e22cb
Merge branch 'main' into fix-transferredCanvasNames
kripken Sep 2, 2022
2f5665b
Update src/library_pthread.js
kripken Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,4 +590,5 @@ a license to everyone to use it as detailed in LICENSE.)
* Alexander Vestin <alex.vestin@gmail.com>
* Xiaobing Yang <yangxiaobing@jwzg.com>
* Alexandra Cherdantseva <neluhus.vagus@gmail.com>
* Skye Gibney <skyejgibney@gmail.com>
* Michael Schmuki <michael@schmuki.io>
* Skye Gibney <skyejgibney@gmail.com>
5 changes: 3 additions & 2 deletions src/library_pthread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,9 @@ var LibraryPThread = {

var offscreenCanvases = {}; // Dictionary of OffscreenCanvas objects we'll transfer to the created thread to own
var moduleCanvasId = Module['canvas'] ? Module['canvas'].id : '';
for (var name of transferredCanvasNames) {
name = name.trim();
// Note that transferredCanvasNames might be null (so we cannot do a for-of loop).
for (var i in transferredCanvasNames) {
var name = transferredCanvasNames[i].trim();
var offscreenCanvasInfo;
try {
if (name == '#canvas') {
Expand Down