Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Support converting JS values to Rc<Promise> with FromJSValConvertible. (#36097)

Browse source 
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2025-03-25 10:08:45 -04:00 • committed by GitHub
parent f65b697a5a
commit f717f6b848
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/promise.rs
View file

@ -15,7 +15,7 @@ use std::ptr;
use std::rc::Rc;
use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
use js::conversions::{ConversionResult, FromJSValConvertibleRc, ToJSValConvertible};
use js::jsapi::{
AddRawValueRoot, CallArgs, GetFunctionNativeReserved, Heap, JS_ClearPendingException,
JS_GetFunctionObject, JS_NewFunction, JSAutoRealm, JSContext, JSObject,
@ -405,3 +405,24 @@ impl PromiseHelpers<crate::DomTypeHolder> for Promise {
Promise::new_resolved(global, cx, value, CanGc::note())
}
}
impl FromJSValConvertibleRc for Promise {
#[allow(unsafe_code)]
unsafe fn from_jsval(
cx: *mut JSContext,
value: HandleValue,
) -> Result<ConversionResult<Rc<Promise>>, ()> {
if value.get().is_null() {
return Ok(ConversionResult::Failure("null not allowed".into()));
}
if !value.get().is_object() {
return Ok(ConversionResult::Failure("not an object".into()));
}
rooted!(in(cx) let obj = value.get().to_object());
if !IsPromiseObject(obj.handle()) {
return Ok(ConversionResult::Failure("not a promise".into()));
}
let promise = Promise::new_with_js_promise(obj.handle(), SafeJSContext::from_ptr(cx));
Ok(ConversionResult::Success(promise))
}
}

1
components/script/dom/testbinding.rs
View file

@ -910,6 +910,7 @@ impl TestBindingMethods<crate::DomTypeHolder> for TestBinding {
fn FuncControlledMethodDisabled(&self) {}
fn FuncControlledMethodEnabled(&self) {}
fn PassRecordPromise(&self, _: Record<DOMString, Rc<Promise>>) {}
fn PassRecord(&self, _: Record<DOMString, i32>) {}
fn PassRecordWithUSVStringKey(&self, _: Record<USVString, i32>) {}
fn PassRecordWithByteStringKey(&self, _: Record<ByteString, i32>) {}