diff options
Diffstat (limited to 'src/components/script/dom/bindings/utils.rs')
-rw-r--r-- | src/components/script/dom/bindings/utils.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 65725b9d923..cbccb90197a 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::bindings::conversions::{FromJSValConvertible, IDLInterface}; -use dom::bindings::js::{JS, JSRef, RootCollection, Unrooted, Root}; +use dom::bindings::js::{JS, JSRef, RootCollection, Temporary, Root}; use dom::bindings::trace::Untraceable; use dom::browsercontext; use dom::window; @@ -391,7 +391,7 @@ pub fn reflect_dom_object<T: Reflectable> (obj: ~T, window: &JSRef<window::Window>, wrap_fn: extern "Rust" fn(*JSContext, &JSRef<window::Window>, ~T) -> JS<T>) - -> Unrooted<T> { + -> Temporary<T> { JS::new(obj, window, wrap_fn) } @@ -616,12 +616,12 @@ pub extern fn outerize_global(_cx: *JSContext, obj: JSHandleObject) -> *JSObject } /// Returns the global object of the realm that the given JS object was created in. -pub fn global_object_for_js_object(obj: *JSObject) -> Unrooted<window::Window> { +pub fn global_object_for_js_object(obj: *JSObject) -> Temporary<window::Window> { unsafe { let global = GetGlobalForObjectCrossCompartment(obj); let clasp = JS_GetClass(global); assert!(((*clasp).flags & (JSCLASS_IS_DOMJSCLASS | JSCLASS_IS_GLOBAL)) != 0); - Unrooted::new( + Temporary::new( FromJSValConvertible::from_jsval(ptr::null(), ObjectOrNullValue(global), ()) .ok().expect("found DOM global that doesn't unwrap to Window")) } |