fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Don't discard PostedMessage tasks when closing a worker

Browse Source 
The spec expects `postMessage()` to act as if it is invoked
immediately. Since `postMessage()` isn't actually invoked immediately,
keep tasks with source `PostedMessage` in the task queue, so that these
tasks are processed. Fixes a hang when `WorkerGlobalScope.close()` is
called immediately after `postMessage()`.
This commit is contained in:
Tim Ledbetter
2024-10-06 22:41:11 +01:00
committed by Andreas Kling
parent d30ae92b82
commit fd8d350b47
5 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/LibWeb/TestConfig.ini
View File

@@ -4,6 +4,7 @@ Text/input/Crypto/SubtleCrypto-exportKey.html
Text/input/Crypto/SubtleCrypto-generateKey.html
Text/input/WebAnimations/misc/DocumentTimeline.html
Text/input/Worker/Worker-blob.html
Text/input/Worker/Worker-close-after-postMessage.html
Text/input/Worker/Worker-crypto.html
Text/input/Worker/Worker-echo.html
Text/input/Worker/Worker-importScripts.html

1
Tests/LibWeb/Text/expected/Worker/Worker-close-after-postMessage.txt Normal file
View File

@@ -0,0 +1 @@
PASS (didn't hang)

12
Tests/LibWeb/Text/input/Worker/Worker-close-after-postMessage.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<script src="../include.js"></script>
<script>
asyncTest(done => {
let work = new Worker("worker-close-after-postMessage.js");
work.onmessage = (evt) => {
println(evt.data);
done();
};
work.postMessage("")
});
</script>

4
Tests/LibWeb/Text/input/Worker/worker-close-after-postMessage.js Normal file
View File

@@ -0,0 +1,4 @@
self.onmessage = function () {
postMessage("PASS (didn't hang)");
self.close();
};

5
Userland/Libraries/LibWeb/HTML/WorkerGlobalScope.cpp
View File

@@ -68,8 +68,9 @@ void WorkerGlobalScope::set_internal_port(JS::NonnullGCPtr<MessagePort> port)
void WorkerGlobalScope::close_a_worker()
{
// 1. Discard any tasks that have been added to workerGlobal's relevant agent's event loop's task queues.
relevant_settings_object(*this).responsible_event_loop().task_queue().remove_tasks_matching([](HTML::Task const&) {
return true;
relevant_settings_object(*this).responsible_event_loop().task_queue().remove_tasks_matching([](HTML::Task const& task) {
// NOTE: We don't discard tasks with the PostedMessage source, as the spec expects PostMessage() to act as if it is invoked immediately
return task.source() != HTML::Task::Source::PostedMessage;
});
// 2. Set workerGlobal's closing flag to true. (This prevents any further tasks from being queued.)