diff options
Diffstat (limited to 'components/script/dom/browsercontext.rs')
| -rw-r--r-- | components/script/dom/browsercontext.rs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index 959c021b4bc..cbe3bcbe63d 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -26,7 +26,7 @@ use js::{JSRESOLVE_QUALIFIED, JSRESOLVE_ASSIGNING}; use std::ptr; -#[allow(raw_pointer_deriving)] +#[allow(raw_pointer_derive)] #[jstraceable] #[privatize] pub struct BrowserContext { @@ -194,17 +194,20 @@ unsafe extern fn set(cx: *mut JSContext, proxy: *mut JSObject, _receiver: *mut J } static PROXY_HANDLER: ProxyTraps = ProxyTraps { - getPropertyDescriptor: Some(getPropertyDescriptor), - getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor), - defineProperty: Some(defineProperty), + getPropertyDescriptor: Some(getPropertyDescriptor as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool), + getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor + as unsafe extern "C" fn(*mut JSContext, *mut JSObject, + jsid, bool, *mut JSPropertyDescriptor) + -> bool), + defineProperty: Some(defineProperty as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut JSPropertyDescriptor) -> bool), getOwnPropertyNames: None, delete_: None, enumerate: None, has: None, - hasOwn: Some(hasOwn), - get: Some(get), - set: Some(set), + hasOwn: Some(hasOwn as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool), + get: Some(get as unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, *mut JSVal) -> bool), + set: Some(set as unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, bool, *mut JSVal) -> bool), keys: None, iterate: None, |