Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 10:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename defineProperty_ to define_property.

Browse source
This commit is contained in:
Ms2ger 2015-01-29 17:14:21 +01:00
parent 4b0c4e5ba2
commit d7de6973c7
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2088,7 +2088,7 @@ class CGDefineProxyHandler(CGAbstractMethod):
return CGAbstractMethod.define(self) return CGAbstractMethod.define(self)
def definition_body(self): def definition_body(self):
customDefineProperty = 'defineProperty_' customDefineProperty = 'proxyhandler::define_property'
if self.descriptor.operations['IndexedSetter'] or self.descriptor.operations['NamedSetter']: if self.descriptor.operations['IndexedSetter'] or self.descriptor.operations['NamedSetter']:
customDefineProperty = 'defineProperty' customDefineProperty = 'defineProperty'
@ -3764,7 +3764,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
" }\n" + " }\n" +
" return true;\n" " return true;\n"
"}\n") % (self.descriptor.name) "}\n") % (self.descriptor.name)
return set + """return proxyhandler::defineProperty_(%s);""" % ", ".join(a.name for a in self.args) return set + """return proxyhandler::define_property(%s);""" % ", ".join(a.name for a in self.args)
def definition_body(self): def definition_body(self):
return CGGeneric(self.getBody()) return CGGeneric(self.getBody())
@ -4580,7 +4580,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::error::throw_dom_exception', 'dom::bindings::error::throw_dom_exception',
'dom::bindings::error::throw_type_error', 'dom::bindings::error::throw_type_error',
'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler',
'dom::bindings::proxyhandler::{_obj_toString, defineProperty_}', 'dom::bindings::proxyhandler::{_obj_toString}',
'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}', 'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
'dom::bindings::proxyhandler::{delete_, get_property_descriptor}', 'dom::bindings::proxyhandler::{delete_, get_property_descriptor}',
'dom::bindings::proxyhandler::{getOwnPropertyNames_, enumerate_}', 'dom::bindings::proxyhandler::{getOwnPropertyNames_, enumerate_}',

5
components/script/dom/bindings/proxyhandler.rs
View file

@ -55,8 +55,9 @@ pub unsafe extern fn get_property_descriptor(cx: *mut JSContext,
} }
/// Defines an expando on the given `proxy`. /// Defines an expando on the given `proxy`.
pub unsafe extern fn defineProperty_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, pub unsafe extern fn define_property(cx: *mut JSContext, proxy: *mut JSObject,
desc: *mut JSPropertyDescriptor) -> bool { id: jsid, desc: *mut JSPropertyDescriptor)
-> bool {
static JSMSG_GETTER_ONLY: libc::c_uint = 160; static JSMSG_GETTER_ONLY: libc::c_uint = 160;
//FIXME: Workaround for https://github.com/mozilla/rust/issues/13385 //FIXME: Workaround for https://github.com/mozilla/rust/issues/13385