From 8b070fef526bf8c1470c9c82ae2431067b2da4ff Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 27 Jul 2019 17:48:21 +0100 Subject: [PATCH] Use safe JSContext in get_constructor_object_from_local_name --- components/script/dom/bindings/htmlconstructor.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs index 6faa4f6211c..40aad6324b6 100644 --- a/components/script/dom/bindings/htmlconstructor.rs +++ b/components/script/dom/bindings/htmlconstructor.rs @@ -76,13 +76,13 @@ use crate::dom::customelementregistry::{ConstructionStackEntry, CustomElementSta use crate::dom::element::{Element, ElementCreator}; use crate::dom::htmlelement::HTMLElement; use crate::dom::window::Window; -use crate::script_runtime::JSContext as SafeJSContext; +use crate::script_runtime::JSContext; use crate::script_thread::ScriptThread; use html5ever::interface::QualName; use html5ever::LocalName; use js::glue::UnwrapObjectStatic; use js::jsapi::{CallArgs, CurrentGlobalOrNull}; -use js::jsapi::{JSAutoRealm, JSContext, JSObject}; +use js::jsapi::{JSAutoRealm, JSObject}; use js::rust::HandleObject; use js::rust::MutableHandleObject; use std::ptr; @@ -134,7 +134,7 @@ where // Step 5 get_constructor_object_from_local_name( definition.local_name.clone(), - *window.get_cx(), + window.get_cx(), global_object.handle(), constructor.handle_mut(), ); @@ -196,13 +196,13 @@ where /// This list should only include elements marked with the [HTMLConstructor] extended attribute. pub fn get_constructor_object_from_local_name( name: LocalName, - cx: *mut JSContext, + cx: JSContext, global: HandleObject, rval: MutableHandleObject, ) -> bool { macro_rules! get_constructor( ($binding:ident) => ({ - unsafe { $binding::GetConstructorObject(SafeJSContext::from_ptr(cx), global, rval); } + unsafe { $binding::GetConstructorObject(cx, global, rval); } true }) );