Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions lib/web_ui/skwasm/library_skwasm_support.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mergeInto(LibraryManager.library, {
skwasmMessage: 'setAssociatedObject',
pointer,
object,
});
}, [object]);
};
_skwasm_getAssociatedObject = function(pointer) {
return associatedObjectsMap.get(pointer);
Expand All @@ -34,11 +34,12 @@ mergeInto(LibraryManager.library, {
associatedObjectsMap.set(data.pointer, data.object);
return;
case 'disposeAssociatedObject':
const object = { data };
const pointer = data.pointer;
const object = associatedObjectsMap.get(pointer);
if (object.close) {
object.close();
}
associatedObjectsMap.delete(data.pointer);
associatedObjectsMap.delete(pointer);
return;
default:
console.warn(`unrecognized skwasm message: ${skwasmMessage}`);
Expand Down Expand Up @@ -81,7 +82,7 @@ mergeInto(LibraryManager.library, {
surface: surfaceHandle,
callbackId,
imageBitmap,
});
}, [imageBitmap]);
};
_skwasm_createGlTextureFromTextureSource = function(textureSource, width, height) {
const glCtx = GL.currentContext.GLctx;
Expand All @@ -98,10 +99,10 @@ mergeInto(LibraryManager.library, {
GL.textures[textureId] = newTexture;
return textureId;
};
_skwasm_disposeAssociatedObjectOnThread = function(threadId, object) {
_skwasm_disposeAssociatedObjectOnThread = function(threadId, pointer) {
PThread.pthreads[threadId].postMessage({
skwasmMessage: 'disposeAssociatedObject',
object,
pointer,
});
};
},
Expand Down
12 changes: 11 additions & 1 deletion lib/web_ui/test/ui/image_golden_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,17 @@ Future<void> testMain() async {
await completer.future;

final DomImageBitmap bitmap = (await createImageBitmap(image).toDart)! as DomImageBitmap;
return renderer.createImageFromImageBitmap(bitmap);

expect(bitmap.width.toDartInt, 150);
expect(bitmap.height.toDartInt, 150);
final ui.Image uiImage = await renderer.createImageFromImageBitmap(bitmap);

if (isSkwasm) {
// Skwasm transfers the bitmap to the web worker, so it should be disposed/consumed.
expect(bitmap.width.toDartInt, 0);
expect(bitmap.height.toDartInt, 0);
}
return uiImage;
});
}

Expand Down