Changeset 289479 in webkit

Timestamp:

Feb 9, 2022 10:05:48 AM (5 months ago)

Author:

Chris Dumez

Message:

Exceptions are not properly reported when initializing a worker as a module
​https://bugs.webkit.org/show_bug.cgi?id=236334

Reviewed by Geoffrey Garen.

LayoutTests/imported/w3c:

Rebaseline WPT tests that are now passing.

• web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror-expected.txt:
• web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException-expected.txt:

Source/WebCore:

No new tests, rebaselined existing tests.

• workers/WorkerOrWorkletScriptController.cpp:

(WebCore::WorkerOrWorkletScriptController::linkAndEvaluateModule):
linkAndEvaluateModule() was failing to report the exception, unlike
evaluate() (which is used for classic workers).

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-sharedworker-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-sharedworker-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/workers/WorkerOrWorkletScriptController.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-09  Chris Dumez  <cdumez@apple.com>
+
+        Exceptions are not properly reported when initializing a worker as a module
+        https://bugs.webkit.org/show_bug.cgi?id=236334
+
+        Reviewed by Geoffrey Garen.
+
+        Rebaseline WPT tests that are now passing.
+
+        * web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror-expected.txt:
+        * web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException-expected.txt:
+
 2022-02-09  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt

@@ -1 +1 @@
 
-FAIL Promise resolved during #report-the-error assert_array_equals: lengths differ, expected array ["handler 1", "handler 2", "handler 1 promise", "handler 2 promise"] length 4, got [] length 0
+FAIL Promise resolved during #report-the-error assert_array_equals: expected property 1 to be "handler 2" but got "handler 1 promise" (expected array ["handler 1", "handler 2", "handler 1 promise", "handler 2 promise"] got ["handler 1", "handler 1 promise", "handler 2", "handler 2 promise"])
 PASS Promise resolved during event handlers other than error
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-sharedworker-expected.txt

@@ -1 +1 @@
 
-FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-1-1", "step-1-2", "microtask", "global-error", "error"] length 5, got ["step-1-1", "step-1-2", "microtask"] length 3
+PASS Test evaluation order of modules
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt

@@ -1 +1 @@
 
-FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-1-1", "step-1-2", "microtask", "global-error", "error"] length 5, got ["step-1-1", "step-1-2", "microtask"] length 3
+PASS Test evaluation order of modules
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-sharedworker-expected.txt

@@ -1 +1 @@
 
-FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-2.2-1", "step-2.2-2", "microtask-2.2", "global-error", "error"] length 5, got ["step-2.2-1", "step-2.2-2", "microtask-2.2"] length 3
+PASS Test evaluation order of modules
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt

@@ -1 +1 @@
 
-FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-2.2-1", "step-2.2-2", "microtask-2.2", "global-error", "error"] length 5, got ["step-2.2-1", "step-2.2-2", "microtask-2.2"] length 3
+PASS Test evaluation order of modules
 

trunk/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror-expected.txt

@@ -8 +8 @@
 PASS Throw in message handler: classic: listener
 PASS Throw in message handler: classic: handler
-FAIL Throw in worker initialization: module: listener assert_unreached: Worker.onerror not fired for: Throw in toplevel Throw in error handler Reached unreachable code
-FAIL Throw in worker initialization: module: handler assert_unreached: Worker.onerror not fired for: Throw in toplevel Throw in error handler Reached unreachable code
+PASS Throw in worker initialization: module: listener
+PASS Throw in worker initialization: module: handler
 PASS Throw in setTimeout(function): module: listener
 PASS Throw in setTimeout(function): module: handler

trunk/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException-expected.txt

@@ -1 +1 @@
 
-Harness Error (TIMEOUT), message = null
-
-TIMEOUT Throw DOMException-TypeError in toplevel: module: listener Test timed out
-TIMEOUT Throw DOMException-TypeError in toplevel: module: handler Test timed out
+PASS Throw DOMException-TypeError in toplevel: module: listener
+PASS Throw DOMException-TypeError in toplevel: module: handler
 PASS Throw DOMException-TypeError in setTimeout-function: module: listener
 PASS Throw DOMException-TypeError in setTimeout-function: module: handler

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-09  Chris Dumez  <cdumez@apple.com>
+
+        Exceptions are not properly reported when initializing a worker as a module
+        https://bugs.webkit.org/show_bug.cgi?id=236334
+
+        Reviewed by Geoffrey Garen.
+
+        No new tests, rebaselined existing tests.
+
+        * workers/WorkerOrWorkletScriptController.cpp:
+        (WebCore::WorkerOrWorkletScriptController::linkAndEvaluateModule):
+        linkAndEvaluateModule() was failing to report the exception, unlike
+        evaluate() (which is used for classic workers).
+
 2022-02-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp

@@ -404 +404 @@
                 *returnedExceptionMessage = genericErrorMessage;
         }
+
+        JSLockHolder lock(vm);
+        reportException(m_globalScopeWrapper.get(), returnedException);
     }
 }