diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 4 | ||||
| -rw-r--r-- | components/script/dom/bindings/proxyhandler.rs | 9 | ||||
| -rw-r--r-- | components/script/dom/browsercontext.rs | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 63e58f2c03c..680fba1471b 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2098,7 +2098,7 @@ class CGDefineProxyHandler(CGAbstractMethod): body = """\ let traps = ProxyTraps { - getPropertyDescriptor: Some(getPropertyDescriptor as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool), + getPropertyDescriptor: Some(get_property_descriptor 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(%s as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut JSPropertyDescriptor) -> bool), getOwnPropertyNames: Some(getOwnPropertyNames_ as unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut AutoIdVector) -> bool), @@ -4582,7 +4582,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler::{_obj_toString, defineProperty_}', 'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}', - 'dom::bindings::proxyhandler::{delete_, getPropertyDescriptor}', + 'dom::bindings::proxyhandler::{delete_, get_property_descriptor}', 'dom::bindings::proxyhandler::{getOwnPropertyNames_, enumerate_}', 'dom::bindings::str::ByteString', 'page::JSPageInfo', diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index 53e69c48e84..fcf2de62aa4 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -31,10 +31,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 getPropertyDescriptor(cx: *mut JSContext, proxy: *mut JSObject, - id: jsid, set: bool, - desc: *mut JSPropertyDescriptor) - -> bool { +pub unsafe extern fn get_property_descriptor(cx: *mut JSContext, + proxy: *mut JSObject, + id: jsid, set: bool, + desc: *mut JSPropertyDescriptor) + -> bool { let handler = GetProxyHandler(proxy); if !InvokeGetOwnPropertyDescriptor(handler, cx, proxy, id, set, desc) { return false; diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index cbe3bcbe63d..16165f68780 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -7,7 +7,7 @@ use dom::bindings::conversions::{ToJSValConvertible}; use dom::bindings::js::{JS, JSRef, Temporary, Root}; use dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable}; use dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}; -use dom::bindings::proxyhandler::{getPropertyDescriptor, FillPropertyDescriptor}; +use dom::bindings::proxyhandler::{get_property_descriptor, FillPropertyDescriptor}; use dom::bindings::utils::{Reflectable, WindowProxyHandler}; use dom::bindings::utils::{GetArrayIndexFromId}; use dom::document::{Document, DocumentHelpers}; @@ -194,7 +194,8 @@ unsafe extern fn set(cx: *mut JSContext, proxy: *mut JSObject, _receiver: *mut J } static PROXY_HANDLER: ProxyTraps = ProxyTraps { - getPropertyDescriptor: Some(getPropertyDescriptor as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool), + getPropertyDescriptor: Some(get_property_descriptor + 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) |