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

Use safe JSContext in get_constructor_object_from_local_name

Browse source
This commit is contained in:
marmeladema 2019-07-27 17:48:21 +01:00
parent 6d444afd9e
commit 8b070fef52
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/bindings/htmlconstructor.rs
View file

@ -76,13 +76,13 @@ use crate::dom::customelementregistry::{ConstructionStackEntry, CustomElementSta
use crate::dom::element::{Element, ElementCreator}; use crate::dom::element::{Element, ElementCreator};
use crate::dom::htmlelement::HTMLElement; use crate::dom::htmlelement::HTMLElement;
use crate::dom::window::Window; use crate::dom::window::Window;
use crate::script_runtime::JSContext as SafeJSContext; use crate::script_runtime::JSContext;
use crate::script_thread::ScriptThread; use crate::script_thread::ScriptThread;
use html5ever::interface::QualName; use html5ever::interface::QualName;
use html5ever::LocalName; use html5ever::LocalName;
use js::glue::UnwrapObjectStatic; use js::glue::UnwrapObjectStatic;
use js::jsapi::{CallArgs, CurrentGlobalOrNull}; use js::jsapi::{CallArgs, CurrentGlobalOrNull};
use js::jsapi::{JSAutoRealm, JSContext, JSObject}; use js::jsapi::{JSAutoRealm, JSObject};
use js::rust::HandleObject; use js::rust::HandleObject;
use js::rust::MutableHandleObject; use js::rust::MutableHandleObject;
use std::ptr; use std::ptr;
@ -134,7 +134,7 @@ where
// Step 5 // Step 5
get_constructor_object_from_local_name( get_constructor_object_from_local_name(
definition.local_name.clone(), definition.local_name.clone(),
*window.get_cx(), window.get_cx(),
global_object.handle(), global_object.handle(),
constructor.handle_mut(), constructor.handle_mut(),
); );
@ -196,13 +196,13 @@ where
/// This list should only include elements marked with the [HTMLConstructor] extended attribute. /// This list should only include elements marked with the [HTMLConstructor] extended attribute.
pub fn get_constructor_object_from_local_name( pub fn get_constructor_object_from_local_name(
name: LocalName, name: LocalName,
cx: *mut JSContext, cx: JSContext,
global: HandleObject, global: HandleObject,
rval: MutableHandleObject, rval: MutableHandleObject,
) -> bool { ) -> bool {
macro_rules! get_constructor( macro_rules! get_constructor(
($binding:ident) => ({ ($binding:ident) => ({
unsafe { $binding::GetConstructorObject(SafeJSContext::from_ptr(cx), global, rval); } unsafe { $binding::GetConstructorObject(cx, global, rval); }
true true
}) })
); );