1 files changed, 29 insertions, 21 deletions

diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index d12a732d53a..e85d93ce326 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -12,11 +12,11 @@ use js::glue::GetProxyExtra;
 use js::glue::InvokeGetOwnPropertyDescriptor;
 use js::glue::{GetProxyHandler, SetProxyExtra};
 use js::jsapi::GetObjectProto;
+use js::jsapi::JS_GetPropertyDescriptorById;
 use js::jsapi::{Handle, HandleId, HandleObject, MutableHandle, ObjectOpResult, RootedObject};
 use js::jsapi::{JSContext, JSObject, JSPropertyDescriptor};
 use js::jsapi::{JSErrNum, JS_StrictPropertyStub};
 use js::jsapi::{JS_DefinePropertyById6, JS_NewObjectWithGivenProto};
-use js::jsapi::{JS_GetPropertyDescriptorById};
 use js::jsval::ObjectValue;
 use js::{JSPROP_ENUMERATE, JSPROP_GETTER, JSPROP_READONLY};
 use libc;
@@ -28,11 +28,11 @@ static JSPROXYSLOT_EXPANDO: u32 = 0;
 /// with argument `id` and return the result, if it is not `undefined`.
 /// Otherwise, walk along the prototype chain to find a property with that
 /// name.
-pub unsafe extern fn get_property_descriptor(cx: *mut JSContext,
-                                             proxy: HandleObject,
-                                             id: HandleId,
-                                             desc: MutableHandle<JSPropertyDescriptor>)
-                                             -> bool {
+pub unsafe extern "C" fn get_property_descriptor(cx: *mut JSContext,
+                                                 proxy: HandleObject,
+                                                 id: HandleId,
+                                                 desc: MutableHandle<JSPropertyDescriptor>)
+                                                 -> bool {
     let handler = GetProxyHandler(proxy.get());
     if !InvokeGetOwnPropertyDescriptor(handler, cx, proxy, id, desc) {
         return false;
@@ -51,11 +51,13 @@ pub unsafe extern fn get_property_descriptor(cx: *mut JSContext,
 }
 
 /// Defines an expando on the given `proxy`.
-pub unsafe extern fn define_property(cx: *mut JSContext, proxy: HandleObject,
-                                     id: HandleId, desc: Handle<JSPropertyDescriptor>,
-                                     result: *mut ObjectOpResult)
-                                     -> bool {
-    //FIXME: Workaround for https://github.com/mozilla/rust/issues/13385
+pub unsafe extern "C" fn define_property(cx: *mut JSContext,
+                                         proxy: HandleObject,
+                                         id: HandleId,
+                                         desc: Handle<JSPropertyDescriptor>,
+                                         result: *mut ObjectOpResult)
+                                         -> bool {
+    // FIXME: Workaround for https://github.com/mozilla/rust/issues/13385
     let setter: *const libc::c_void = mem::transmute(desc.get().setter);
     let setter_stub: *const libc::c_void = mem::transmute(JS_StrictPropertyStub);
     if (desc.get().attrs & JSPROP_GETTER) != 0 && setter == setter_stub {
@@ -68,8 +70,11 @@ pub unsafe extern fn define_property(cx: *mut JSContext, proxy: HandleObject,
 }
 
 /// Deletes an expando off the given `proxy`.
-pub unsafe extern fn delete(cx: *mut JSContext, proxy: HandleObject, id: HandleId,
-                            bp: *mut ObjectOpResult) -> bool {
+pub unsafe extern "C" fn delete(cx: *mut JSContext,
+                                proxy: HandleObject,
+                                id: HandleId,
+                                bp: *mut ObjectOpResult)
+                                -> bool {
     let expando = RootedObject::new(cx, get_expando_object(proxy));
     if expando.ptr.is_null() {
         (*bp).code_ = 0 /* OkCode */;
@@ -80,16 +85,19 @@ pub unsafe extern fn delete(cx: *mut JSContext, proxy: HandleObject, id: HandleI
 }
 
 /// Controls whether the Extensible bit can be changed
-pub unsafe extern fn prevent_extensions(_cx: *mut JSContext,
-                                        _proxy: HandleObject,
-                                        result: *mut ObjectOpResult) -> bool {
+pub unsafe extern "C" fn prevent_extensions(_cx: *mut JSContext,
+                                            _proxy: HandleObject,
+                                            result: *mut ObjectOpResult)
+                                            -> bool {
     (*result).code_ = JSErrNum::JSMSG_CANT_PREVENT_EXTENSIONS as ::libc::uintptr_t;
     true
 }
 
 /// Reports whether the object is Extensible
-pub unsafe extern fn is_extensible(_cx: *mut JSContext, _proxy: HandleObject,
-                                   succeeded: *mut bool) -> bool {
+pub unsafe extern "C" fn is_extensible(_cx: *mut JSContext,
+                                       _proxy: HandleObject,
+                                       succeeded: *mut bool)
+                                       -> bool {
     *succeeded = true;
     true
 }
@@ -109,8 +117,7 @@ pub fn get_expando_object(obj: HandleObject) -> *mut JSObject {
 
 /// Get the expando object, or create it if it doesn't exist yet.
 /// Fails on JSAPI failure.
-pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject)
-                             -> *mut JSObject {
+pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject) -> *mut JSObject {
     unsafe {
         assert!(is_dom_proxy(obj.get()));
         let mut expando = get_expando_object(obj);
@@ -127,7 +134,8 @@ pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject)
 /// Set the property descriptor's object to `obj` and set it to enumerable,
 /// and writable if `readonly` is true.
 pub fn fill_property_descriptor(desc: &mut JSPropertyDescriptor,
-                                obj: *mut JSObject, readonly: bool) {
+                                obj: *mut JSObject,
+                                readonly: bool) {
     desc.obj = obj;
     desc.attrs = if readonly { JSPROP_READONLY } else { 0 } | JSPROP_ENUMERATE;
     desc.getter = None;