diff options
author | Marcin Mielniczuk <marmistrz.dev@zoho.eu> | 2018-03-28 21:28:30 +0200 |
---|---|---|
committer | Marcin Mielniczuk <marmistrz.dev@zoho.eu> | 2018-03-28 21:28:30 +0200 |
commit | 356c57e628255ed338b32246ce5e7de75da621f0 (patch) | |
tree | e6b98e284bf4cabce6c0dfce8b593dc9c2f8a534 /components/script/dom/bindings/callback.rs | |
parent | e04d517bff695c03df7f0417a494c8286860bc3c (diff) | |
download | servo-356c57e628255ed338b32246ce5e7de75da621f0.tar.gz servo-356c57e628255ed338b32246ce5e7de75da621f0.zip |
Adapt Servo for mozjs 0.6 and the changes introduced in servo/rust-mozjs#393
Diffstat (limited to 'components/script/dom/bindings/callback.rs')
-rw-r--r-- | components/script/dom/bindings/callback.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index 781ebd46466..6b4d7cd981a 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -10,13 +10,13 @@ use dom::bindings::root::{Dom, DomRoot}; use dom::bindings::settings_stack::{AutoEntryScript, AutoIncumbentScript}; use dom::bindings::utils::AsCCharPtrPtr; use dom::globalscope::GlobalScope; -use js::jsapi::{Heap, MutableHandleObject}; -use js::jsapi::{IsCallable, JSContext, JSObject, JS_WrapObject, AddRawValueRoot}; +use js::jsapi::{IsCallable, JSContext, JSObject, AddRawValueRoot}; use js::jsapi::{JSCompartment, JS_EnterCompartment, JS_LeaveCompartment, RemoveRawValueRoot}; +use js::jsapi::Heap; use js::jsapi::JSAutoCompartment; -use js::jsapi::JS_GetProperty; use js::jsval::{JSVal, UndefinedValue, ObjectValue}; -use js::rust::Runtime; +use js::rust::{MutableHandleObject, Runtime}; +use js::rust::wrappers::{JS_WrapObject, JS_GetProperty}; use std::default::Default; use std::ffi::CString; use std::mem::drop; @@ -206,7 +206,7 @@ impl CallbackInterface { /// Wraps the reflector for `p` into the compartment of `cx`. pub fn wrap_call_this_object<T: DomObject>(cx: *mut JSContext, p: &T, - rval: MutableHandleObject) { + mut rval: MutableHandleObject) { rval.set(p.reflector().get_jsobject().get()); assert!(!rval.get().is_null()); |