Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 00:29:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Return a Result from GlobalScope::evaluate_script_on_global_with_result (#38549)

Browse source 
Make GlobalScope::evaluate_script_on_global_with_result return a Result
instead of a boolean. This is the first step to resolve issue #37810.

Testing: Should not break or fix any existing tests

---------

Signed-off-by: Rodion Borovyk <rodion.borovyk@gmail.com>
This commit is contained in:
Rodion Borovyk 2025-08-10 18:51:46 +02:00 • committed by GitHub
parent 86c37a380b
commit 4f8731d562
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/globalscope.rs
View file

@ -26,7 +26,7 @@ use content_security_policy::CspList;
use crossbeam_channel::Sender;
use devtools_traits::{PageError, ScriptToDevtoolsControlMsg};
use dom_struct::dom_struct;
use embedder_traits::EmbedderMsg;
use embedder_traits::{EmbedderMsg, JavaScriptEvaluationError};
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::router::ROUTER;
use js::glue::{IsWrapper, UnwrapObjectDynamic};
@ -2762,7 +2762,7 @@ impl GlobalScope {
script_base_url: ServoUrl,
can_gc: CanGc,
introduction_type: Option<&'static CStr>,
) -> bool {
) -> Result<(), JavaScriptEvaluationError> {
let source_code = SourceCode::Text(Rc::new(DOMString::from_string((*code).to_string())));
self.evaluate_script_on_global_with_result(
&source_code,
@ -2789,7 +2789,7 @@ impl GlobalScope {
script_base_url: ServoUrl,
can_gc: CanGc,
introduction_type: Option<&'static CStr>,
) -> bool {
) -> Result<(), JavaScriptEvaluationError> {
let cx = GlobalScope::get_cx();
let ar = enter_realm(self);
@ -2815,7 +2815,7 @@ impl GlobalScope {
if compiled_script.is_null() {
debug!("error compiling Dom string");
report_pending_exception(cx, true, InRealm::Entered(&ar), can_gc);
return false;
return Err(JavaScriptEvaluationError::CompilationFailure);
}
},
SourceCode::Compiled(pre_compiled_script) => {
@ -2865,10 +2865,11 @@ impl GlobalScope {
if !result {
debug!("error evaluating Dom string");
report_pending_exception(cx, true, InRealm::Entered(&ar), can_gc);
return Err(JavaScriptEvaluationError::EvaluationFailure);
}
maybe_resume_unwind();
result
Ok(())
}
}