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

Added is_platform_obj_static

Browse source
This commit is contained in:
Sean Joseph 2020-11-26 18:30:52 -05:00
parent 3c8680f273
commit 823cca30d6
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -6182,7 +6182,8 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
'crate::dom::bindings::utils::get_property_on_prototype', 'crate::dom::bindings::utils::get_property_on_prototype',
'crate::dom::bindings::utils::get_proto_or_iface_array', 'crate::dom::bindings::utils::get_proto_or_iface_array',
'crate::dom::bindings::utils::has_property_on_prototype', 'crate::dom::bindings::utils::has_property_on_prototype',
'crate::dom::bindings::utils::is_platform_object', 'crate::dom::bindings::utils::is_platform_object_dynamic',
'crate::dom::bindings::utils::is_platform_object_static',
'crate::dom::bindings::utils::resolve_global', 'crate::dom::bindings::utils::resolve_global',
'crate::dom::bindings::utils::set_dictionary_property', 'crate::dom::bindings::utils::set_dictionary_property',
'crate::dom::bindings::utils::trace_global', 'crate::dom::bindings::utils::trace_global',

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

@ -19,7 +19,7 @@ use crate::script_runtime::JSContext as SafeJSContext;
use js::conversions::{jsstr_to_string, ToJSValConvertible}; use js::conversions::{jsstr_to_string, ToJSValConvertible};
use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper}; use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper};
use js::glue::{GetCrossCompartmentWrapper, JS_GetReservedSlot, WrapperNew}; use js::glue::{GetCrossCompartmentWrapper, JS_GetReservedSlot, WrapperNew};
use js::glue::{UnwrapObjectDynamic, RUST_JSID_TO_INT, RUST_JSID_TO_STRING}; use js::glue::{UnwrapObjectDynamic, UnwrapObjectStatic, RUST_JSID_TO_INT, RUST_JSID_TO_STRING};
use js::glue::{ use js::glue::{
RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT, RUST_JSID_IS_STRING, RUST_JSID_IS_VOID, RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT, RUST_JSID_IS_STRING, RUST_JSID_IS_VOID,
}; };
@ -251,9 +251,24 @@ pub unsafe fn find_enum_value<'a, T>(
)) ))
} }
/// Returns wether `obj` is a platform object /// Returns wether `obj` is a platform object using dynamic unwrap
/// <https://heycam.github.io/webidl/#dfn-platform-object> /// <https://heycam.github.io/webidl/#dfn-platform-object>
pub fn is_platform_object(obj: *mut JSObject, cx: *mut JSContext) -> bool { pub fn is_platform_object_dynamic(obj: *mut JSObject, cx: *mut JSContext) -> bool {
is_platform_object(obj, &|o| unsafe {
UnwrapObjectDynamic(o, cx, /* stopAtWindowProxy = */ 0)
})
}
/// Returns wether `obj` is a platform object using static unwrap
/// <https://heycam.github.io/webidl/#dfn-platform-object>
pub fn is_platform_object_static(obj: *mut JSObject) -> bool {
is_platform_object(obj, &|o| unsafe { UnwrapObjectStatic(o) })
}
fn is_platform_object(
obj: *mut JSObject,
unwrap_obj: &dyn Fn(*mut JSObject) -> *mut JSObject,
) -> bool {
unsafe { unsafe {
// Fast-path the common case // Fast-path the common case
let mut clasp = get_object_class(obj); let mut clasp = get_object_class(obj);
@ -262,7 +277,7 @@ pub fn is_platform_object(obj: *mut JSObject, cx: *mut JSContext) -> bool {
} }
// Now for simplicity check for security wrappers before anything else // Now for simplicity check for security wrappers before anything else
if IsWrapper(obj) { if IsWrapper(obj) {
let unwrapped_obj = UnwrapObjectDynamic(obj, cx, /* stopAtWindowProxy = */ 0); let unwrapped_obj = unwrap_obj(obj);
if unwrapped_obj.is_null() { if unwrapped_obj.is_null() {
return false; return false;
} }