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

chore(deps): update mozjs

Browse source 
- 798c5b6: Bring `RustJSPrincipals` back
This commit is contained in:
yvt 2021-07-11 23:01:21 +09:00
parent fd177a9199
commit 40fbe6b722
4 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/bindings/interface.rs
View file

@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::PrototypeList;
use crate::dom::bindings::constant::{define_constants, ConstantSpec};
use crate::dom::bindings::conversions::{get_dom_class, DOM_OBJECT_SLOT};
use crate::dom::bindings::guard::Guard;
use crate::dom::bindings::utils::{ProtoOrIfaceArray, DOM_PROTOTYPE_SLOT};
use crate::dom::bindings::utils::{ProtoOrIfaceArray, ServoJSPrincipal, DOM_PROTOTYPE_SLOT};
use crate::dom::window::Window;
use crate::script_runtime::JSContext as SafeJSContext;
use js::error::throw_type_error;
@ -149,14 +149,12 @@ pub unsafe fn create_global_object(
options.creationOptions_.streams_ = true;
select_compartment(cx, &mut options);
let origin = Box::new(origin.clone());
let mut principal =
CreateRustJSPrincipal(Box::into_raw(origin) as *const ::libc::c_void, None, None);
let principal = ServoJSPrincipal::new(origin);
rval.set(JS_NewGlobalObject(
*cx,
class,
principal,
principal.0,
OnNewGlobalHookOption::DontFireOnNewGlobalHook,
&*options,
));

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

@ -29,7 +29,10 @@ use js::glue::{
CreateCrossOriginWrapper, GetCrossCompartmentWrapper, GetOpaqueWrapper, GetSecurityWrapper,
JS_GetReservedSlot, WrapperNew,
};
use js::glue::{CreateWrapperProxyHandler, GetPrincipalOrigin, UncheckedUnwrapObject};
use js::glue::{
CreateRustJSPrincipals, CreateWrapperProxyHandler, GetRustJSPrincipalsPrivate,
JSPrincipalsCallbacks, UncheckedUnwrapObject,
};
use js::glue::{UnwrapObjectDynamic, UnwrapObjectStatic, RUST_JSID_TO_INT, RUST_JSID_TO_STRING};
use js::glue::{
RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT, RUST_JSID_IS_STRING, RUST_JSID_IS_VOID,
@ -83,17 +86,32 @@ impl MallocSizeOf for WindowProxyHandler {
}
//TODO make principal.rs
pub struct ServoJSPrincipal(*mut JSPrincipals);
// TODO: RAII ref-counting
pub struct ServoJSPrincipal(pub *mut JSPrincipals);
impl ServoJSPrincipal {
pub fn new(origin: &MutableOrigin) -> Self {
let private: Box<MutableOrigin> = Box::new(origin.clone());
Self(unsafe { CreateRustJSPrincipals(&PRINCIPALS_CALLBACKS, Box::into_raw(private) as _) })
}
pub unsafe fn origin(&self) -> MutableOrigin {
let origin = GetPrincipalOrigin(self.0) as *mut MutableOrigin;
let origin = GetRustJSPrincipalsPrivate(self.0) as *mut MutableOrigin;
(*origin).clone()
}
}
pub unsafe fn destroy_servo_jsprincipal(principal: &mut ServoJSPrincipal) {
let origin = GetPrincipalOrigin(principal.0) as *mut Box<MutableOrigin>;
pub unsafe extern "C" fn destroy_servo_jsprincipal(principals: *mut JSPrincipals) {
(GetRustJSPrincipalsPrivate(principals) as *mut Box<MutableOrigin>).drop_in_place();
}
const PRINCIPALS_CALLBACKS: JSPrincipalsCallbacks = JSPrincipalsCallbacks {
write: None,
isSystemOrAddonPrincipal: Some(principals_is_system_or_addon_principal),
};
unsafe extern "C" fn principals_is_system_or_addon_principal(_: *mut JSPrincipals) -> bool {
false
}
#[derive(Debug, PartialEq)]