Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-15 02:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Send JS evaluation errors to constellation (#38602)

Browse source 
Send JS evaluation errors to constellation in
`script_thread::handle_evaluate_javascript` instead of silently
swallowing.

Testing: New test cases in `tests/webview.rs`: one for compilation
failure, another for evaluation failure.
Fixes: #37810

Signed-off-by: Rodion Borovyk <rodion.borovyk@gmail.com>
This commit is contained in:
Rodion Borovyk 2025-08-12 09:19:39 +02:00 • committed by GitHub
parent 9effdce5a1
commit e5a73ede17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/script_thread.rs
View file

@ -4048,14 +4048,21 @@ impl ScriptThread {
let context = window.get_cx();
rooted!(in(*context) let mut return_value = UndefinedValue());
_ = global_scope.evaluate_js_on_global_with_result(
if let Err(err) = global_scope.evaluate_js_on_global_with_result(
&script,
return_value.handle_mut(),
ScriptFetchOptions::default_classic_script(global_scope),
global_scope.api_base_url(),
can_gc,
None, // No known `introductionType` for JS code from embedder
);
) {
_ = self.senders.pipeline_to_constellation_sender.send((
pipeline_id,
ScriptToConstellationMessage::FinishJavaScriptEvaluation(evaluation_id, Err(err)),
));
return;
};
let result = match jsval_to_webdriver(
context,
global_scope,

6
components/servo/tests/webview.rs
View file

@ -125,6 +125,12 @@ fn test_evaluate_javascript_basic(servo_test: &ServoTest) -> Result<(), anyhow::
);
ensure!(matches!(result, Ok(JSValue::Frame(..))));
let result = evaluate_javascript(servo_test, webview.clone(), "lettt badsyntax = 123");
ensure!(result == Err(JavaScriptEvaluationError::CompilationFailure));
let result = evaluate_javascript(servo_test, webview.clone(), "throw new Error()");
ensure!(result == Err(JavaScriptEvaluationError::EvaluationFailure));
Ok(())
}