Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Start generating arrays of specs for easier implementation of preference checks.

Browse source
This commit is contained in:
Josh Matthews 2016-03-23 19:00:32 -04:00
parent 693d31d4ed
commit 88059acd7e
3 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1368,9 +1368,17 @@ class PropertyDefiner:
if specTerminator: if specTerminator:
specs.append(specTerminator) specs.append(specTerminator)
return (("const %s: &'static [%s] = &[\n" + specsArray = ("const %s_specs: &'static [%s] = &[\n" +
",\n".join(specs) + "\n" + ",\n".join(specs) + "\n" +
"];\n") % (name, specType)) "];\n") % (name, specType)
prefArray = ("const %s: &'static [Prefable<%s>] = &[\n" +
" Prefable {\n" +
" pref: None,\n" +
" specs: &%s_specs,\n" +
" },\n" +
"];\n") % (name, specType, name)
return specsArray + prefArray
# The length of a method is the minimum of the lengths of the # The length of a method is the minimum of the lengths of the
@ -2240,8 +2248,8 @@ def InitUnforgeablePropertiesOnHolder(descriptor, properties):
""" """
unforgeables = [] unforgeables = []
defineUnforgeableAttrs = "define_properties(cx, unforgeable_holder.handle(), %s).unwrap();" defineUnforgeableAttrs = "define_properties(cx, unforgeable_holder.handle(), %s_specs).unwrap();"
defineUnforgeableMethods = "define_methods(cx, unforgeable_holder.handle(), %s).unwrap();" defineUnforgeableMethods = "define_methods(cx, unforgeable_holder.handle(), %s_specs).unwrap();"
unforgeableMembers = [ unforgeableMembers = [
(defineUnforgeableAttrs, properties.unforgeable_attrs), (defineUnforgeableAttrs, properties.unforgeable_attrs),
@ -5467,7 +5475,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::js::{JS, Root, RootedReference}', 'dom::bindings::js::{JS, Root, RootedReference}',
'dom::bindings::js::{OptionalRootedReference}', 'dom::bindings::js::{OptionalRootedReference}',
'dom::bindings::reflector::{Reflectable}', 'dom::bindings::reflector::{Reflectable}',
'dom::bindings::utils::{DOMClass, DOMJSClass}', 'dom::bindings::utils::{DOMClass, DOMJSClass, Prefable}',
'dom::bindings::utils::{DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, JSCLASS_DOM_GLOBAL}', 'dom::bindings::utils::{DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, JSCLASS_DOM_GLOBAL}',
'dom::bindings::utils::{ProtoOrIfaceArray, create_dom_global}', 'dom::bindings::utils::{ProtoOrIfaceArray, create_dom_global}',
'dom::bindings::utils::{enumerate_global, finalize_global, find_enum_string_index}', 'dom::bindings::utils::{enumerate_global, finalize_global, find_enum_string_index}',

38
components/script/dom/bindings/interface.rs
View file

@ -6,7 +6,7 @@
use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList;
use dom::bindings::conversions::get_dom_class; use dom::bindings::conversions::get_dom_class;
use dom::bindings::utils::get_proto_or_iface_array; use dom::bindings::utils::{get_proto_or_iface_array, Prefable};
use js::error::throw_type_error; use js::error::throw_type_error;
use js::glue::UncheckedUnwrapObject; use js::glue::UncheckedUnwrapObject;
use js::jsapi::{Class, ClassExtension, ClassSpec, GetGlobalForObjectCrossCompartment}; use js::jsapi::{Class, ClassExtension, ClassSpec, GetGlobalForObjectCrossCompartment};
@ -212,13 +212,15 @@ impl InterfaceConstructorBehavior {
pub unsafe fn create_callback_interface_object( pub unsafe fn create_callback_interface_object(
cx: *mut JSContext, cx: *mut JSContext,
receiver: HandleObject, receiver: HandleObject,
constants: &'static [ConstantSpec], constants: &'static [Prefable<ConstantSpec>],
name: &'static [u8], name: &'static [u8],
rval: MutableHandleObject) { rval: MutableHandleObject) {
assert!(!constants.is_empty()); assert!(!constants.is_empty());
rval.set(JS_NewObject(cx, ptr::null())); rval.set(JS_NewObject(cx, ptr::null()));
assert!(!rval.ptr.is_null()); assert!(!rval.ptr.is_null());
define_constants(cx, rval.handle(), constants); for prefable in constants {
define_constants(cx, rval.handle(), prefable.specs);
}
define_name(cx, rval.handle(), name); define_name(cx, rval.handle(), name);
define_on_global_object(cx, receiver, name, rval.handle()); define_on_global_object(cx, receiver, name, rval.handle());
} }
@ -228,9 +230,9 @@ pub unsafe fn create_interface_prototype_object(
cx: *mut JSContext, cx: *mut JSContext,
proto: HandleObject, proto: HandleObject,
class: &'static JSClass, class: &'static JSClass,
regular_methods: Option<&'static [JSFunctionSpec]>, regular_methods: Option<&'static [Prefable<JSFunctionSpec>]>,
regular_properties: Option<&'static [JSPropertySpec]>, regular_properties: Option<&'static [Prefable<JSPropertySpec>]>,
constants: &'static [ConstantSpec], constants: &'static [Prefable<ConstantSpec>],
rval: MutableHandleObject) { rval: MutableHandleObject) {
create_object(cx, proto, class, regular_methods, regular_properties, constants, rval); create_object(cx, proto, class, regular_methods, regular_properties, constants, rval);
} }
@ -241,9 +243,9 @@ pub unsafe fn create_noncallback_interface_object(
receiver: HandleObject, receiver: HandleObject,
proto: HandleObject, proto: HandleObject,
class: &'static NonCallbackInterfaceObjectClass, class: &'static NonCallbackInterfaceObjectClass,
static_methods: Option<&'static [JSFunctionSpec]>, static_methods: Option<&'static [Prefable<JSFunctionSpec>]>,
static_properties: Option<&'static [JSPropertySpec]>, static_properties: Option<&'static [Prefable<JSPropertySpec>]>,
constants: &'static [ConstantSpec], constants: &'static [Prefable<ConstantSpec>],
interface_prototype_object: HandleObject, interface_prototype_object: HandleObject,
name: &'static [u8], name: &'static [u8],
length: u32, length: u32,
@ -355,19 +357,25 @@ unsafe fn create_object(
cx: *mut JSContext, cx: *mut JSContext,
proto: HandleObject, proto: HandleObject,
class: &'static JSClass, class: &'static JSClass,
methods: Option<&'static [JSFunctionSpec]>, methods: Option<&'static [Prefable<JSFunctionSpec>]>,
properties: Option<&'static [JSPropertySpec]>, properties: Option<&'static [Prefable<JSPropertySpec>]>,
constants: &'static [ConstantSpec], constants: &'static [Prefable<ConstantSpec>],
rval: MutableHandleObject) { rval: MutableHandleObject) {
rval.set(JS_NewObjectWithUniqueType(cx, class, proto)); rval.set(JS_NewObjectWithUniqueType(cx, class, proto));
assert!(!rval.ptr.is_null()); assert!(!rval.ptr.is_null());
if let Some(methods) = methods { if let Some(methods) = methods {
define_methods(cx, rval.handle(), methods).unwrap(); for prefable in methods {
define_methods(cx, rval.handle(), prefable.specs).unwrap();
}
} }
if let Some(properties) = properties { if let Some(properties) = properties {
define_properties(cx, rval.handle(), properties).unwrap(); for prefable in properties {
define_properties(cx, rval.handle(), prefable.specs).unwrap();
}
}
for prefable in constants {
define_constants(cx, rval.handle(), prefable.specs);
} }
define_constants(cx, rval.handle(), constants);
} }
unsafe fn define_name(cx: *mut JSContext, obj: HandleObject, name: &'static [u8]) { unsafe fn define_name(cx: *mut JSContext, obj: HandleObject, name: &'static [u8]) {

6
components/script/dom/bindings/utils.rs
View file

@ -557,3 +557,9 @@ unsafe extern "C" fn instance_class_has_proto_at_depth(clasp: *const js::jsapi::
pub const DOM_CALLBACKS: DOMCallbacks = DOMCallbacks { pub const DOM_CALLBACKS: DOMCallbacks = DOMCallbacks {
instanceClassMatchesProto: Some(instance_class_has_proto_at_depth), instanceClassMatchesProto: Some(instance_class_has_proto_at_depth),
}; };
#[allow(missing_docs)]
pub struct Prefable<T: 'static> {
pub pref: Option<&'static str>,
pub specs: &'static [T]
}