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

DefineDOMInterfaceMethod now takes a SafeJSContext instead of a JSContext

Browse source 
as first argument.
This commit is contained in:
marmeladema 2019-07-21 01:25:29 +01:00
parent aa0e4f5c76
commit 6e4caf1153
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/bindings/utils.rs
View file

@ -13,6 +13,7 @@ use crate::dom::bindings::inheritance::TopTypeId;
use crate::dom::bindings::str::DOMString;
use crate::dom::bindings::trace::trace_object;
use crate::dom::windowproxy;
use crate::script_runtime::JSContext as SafeJSContext;
use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper};
use js::glue::{GetCrossCompartmentWrapper, JS_GetReservedSlot, WrapperNew};
use js::glue::{UnwrapObjectDynamic, RUST_JSID_TO_INT, RUST_JSID_TO_STRING};
@ -353,7 +354,7 @@ pub unsafe extern "C" fn enumerate_global(
return false;
}
for init_fun in InterfaceObjectMap::MAP.values() {
init_fun(cx, Handle::from_raw(obj));
init_fun(SafeJSContext::from_ptr(cx), Handle::from_raw(obj));
}
true
}
@ -388,7 +389,7 @@ pub unsafe extern "C" fn resolve_global(
let bytes = slice::from_raw_parts(ptr, length as usize);
if let Some(init_fun) = InterfaceObjectMap::MAP.get(bytes) {
init_fun(cx, Handle::from_raw(obj));
init_fun(SafeJSContext::from_ptr(cx), Handle::from_raw(obj));
*rval = true;
} else {
*rval = false;