Merge pull request #2695 from Ms2ger/NativeProperties

Introduce a NativeProperties struct; r=jdm

src/components/script/dom/bindings/codegen/CodegenRust.py

@@ -1064,9 +1064,10 @@ class PropertyDefiner:
         self.name = name
 
     def variableName(self):
-        if len(self.regular) > 0:
-            return "s" + self.name
-        return "ptr::null()"
+        return "s" + self.name
+
+    def length(self):
+        return len(self.regular)
 
     def __str__(self):
         # We only need to generate id arrays for things that will end
@@ -1101,9 +1102,9 @@ class PropertyDefiner:
         if specTerminator:
             specs.append(specTerminator)
 
-        return (("static %s: [%s, ..%i] = [\n" +
+        return (("static %s: &'static [%s] = &[\n" +
                  ",\n".join(specs) + "\n" +
-                 "];\n\n") % (name, specType, len(specs)))
+                 "];\n\n") % (name, specType))
 
 # The length of a method is the maximum of the lengths of the
 # argument lists of all its overloads.
@@ -1853,6 +1854,31 @@ class PropertyArrays():
             define += str(getattr(self, array))
         return define
 
+
+class CGNativeProperties(CGThing):
+    def __init__(self, descriptor, properties):
+        CGThing.__init__(self)
+        self.properties = properties
+
+    def define(self):
+        def getField(array):
+            propertyArray = getattr(self.properties, array)
+            if propertyArray.length() > 0:
+                value = "Some(%s)" % propertyArray.variableName()
+            else:
+                value = "None"
+
+            return CGGeneric(string.Template('${name}: ${value},').substitute({
+                'name': array,
+                'value': value,
+            }))
+
+        nativeProps = CGList([getField(array) for array in self.properties.arrayNames()], '\n')
+        return CGWrapper(CGIndenter(nativeProps),
+                         pre="static sNativeProperties: NativeProperties = NativeProperties {\n",
+                         post="\n};\n").define()
+
+
 class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
     """
     Generate the CreateInterfaceObjects method for an interface descriptor.
@@ -1890,12 +1916,6 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
         else:
             domClass = "ptr::null()"
 
-        def arrayPtr(name):
-            val = ('%(' + name + ')s') % self.properties.variableNames()
-            if val == "ptr::null()":
-                return "None"
-            return "Some(%s.as_slice())" % val
-
         if needInterfaceObject:
             if self.descriptor.interface.ctor():
                 constructHook = CONSTRUCT_HOOK_NAME
@@ -1913,14 +1933,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
         call = """return CreateInterfaceObjects2(aCx, aGlobal, aReceiver, parentProto,
                                &PrototypeClass, %s,
                                %s,
-                               %s,
-                               %s,
-                               %s,
-                               %s);""" % (
-            constructor,
-            domClass,
-            arrayPtr("methods"), arrayPtr("attrs"),
-            arrayPtr("consts"), arrayPtr("staticMethods"))
+                               &sNativeProperties);""" % (constructor, domClass)
 
         return CGList([
             CGGeneric(getParentProto),
@@ -3863,6 +3876,7 @@ class CGDescriptor(CGThing):
 
         properties = PropertyArrays(descriptor)
         cgThings.append(CGGeneric(str(properties)))
+        cgThings.append(CGNativeProperties(descriptor, properties))
         cgThings.append(CGCreateInterfaceObjectsMethod(descriptor, properties))
 
         cgThings.append(CGNamespace.build([descriptor.name + "Constants"],
@@ -4233,6 +4247,7 @@ class CGBindingRoot(CGThing):
             'dom::bindings::utils::{ThrowingConstructor,  unwrap, unwrap_jsmanaged}',
             'dom::bindings::utils::VoidVal',
             'dom::bindings::utils::get_dictionary_property',
+            'dom::bindings::utils::NativeProperties',
             'dom::bindings::trace::JSTraceable',
             'dom::bindings::callback::{CallbackContainer,CallbackInterface,CallbackFunction}',
             'dom::bindings::callback::{CallSetup,ExceptionHandling}',

src/components/script/dom/bindings/utils.rs

@@ -215,6 +215,13 @@ pub fn GetProtoOrIfaceArray(global: *mut JSObject) -> *mut *mut JSObject {
     }
 }
 
+pub struct NativeProperties {
+    pub methods: Option<&'static [JSFunctionSpec]>,
+    pub attrs: Option<&'static [JSPropertySpec]>,
+    pub consts: Option<&'static [ConstantSpec]>,
+    pub staticMethods: Option<&'static [JSFunctionSpec]>,
+}
+
 pub type NonNullJSNative =
     unsafe extern "C" fn (arg1: *mut JSContext, arg2: c_uint, arg3: *mut JSVal) -> JSBool;
 
@@ -223,13 +230,9 @@ pub fn CreateInterfaceObjects2(cx: *mut JSContext, global: *mut JSObject, receiv
                                protoClass: &'static JSClass,
                                constructor: Option<(NonNullJSNative, &'static str, u32)>,
                                domClass: *DOMClass,
-                               methods: Option<&'static [JSFunctionSpec]>,
-                               properties: Option<&'static [JSPropertySpec]>,
-                               constants: Option<&'static [ConstantSpec]>,
-                               staticMethods: Option<&'static [JSFunctionSpec]>) -> *mut JSObject {
+                               members: &'static NativeProperties) -> *mut JSObject {
     let proto = CreateInterfacePrototypeObject(cx, global, protoProto,
-                                               protoClass, methods,
-                                               properties, constants);
+                                               protoClass, members);
 
     unsafe {
         JS_SetReservedSlot(proto, DOM_PROTO_INSTANCE_CLASS_SLOT,
@@ -241,7 +244,7 @@ pub fn CreateInterfaceObjects2(cx: *mut JSContext, global: *mut JSObject, receiv
             name.to_c_str().with_ref(|s| {
                 CreateInterfaceObject(cx, global, receiver,
                                       native, nargs, proto,
-                                      staticMethods, constants, s)
+                                      members, s)
             })
         },
         None => (),
@@ -253,8 +256,7 @@ pub fn CreateInterfaceObjects2(cx: *mut JSContext, global: *mut JSObject, receiv
 fn CreateInterfaceObject(cx: *mut JSContext, global: *mut JSObject, receiver: *mut JSObject,
                          constructorNative: NonNullJSNative,
                          ctorNargs: u32, proto: *mut JSObject,
-                         staticMethods: Option<&'static [JSFunctionSpec]>,
-                         constants: Option<&'static [ConstantSpec]>,
+                         members: &'static NativeProperties,
                          name: *libc::c_char) {
     unsafe {
         let fun = JS_NewFunction(cx, Some(constructorNative), ctorNargs,
@@ -264,12 +266,12 @@ fn CreateInterfaceObject(cx: *mut JSContext, global: *mut JSObject, receiver: *m
         let constructor = JS_GetFunctionObject(fun);
         assert!(constructor.is_not_null());
 
-        match staticMethods {
+        match members.staticMethods {
             Some(staticMethods) => DefineMethods(cx, constructor, staticMethods),
             _ => (),
         }
 
-        match constants {
+        match members.consts {
             Some(constants) => DefineConstants(cx, constructor, constants),
             _ => (),
         }
@@ -323,24 +325,22 @@ fn DefineProperties(cx: *mut JSContext, obj: *mut JSObject, properties: &'static
 fn CreateInterfacePrototypeObject(cx: *mut JSContext, global: *mut JSObject,
                                   parentProto: *mut JSObject,
                                   protoClass: &'static JSClass,
-                                  methods: Option<&'static [JSFunctionSpec]>,
-                                  properties: Option<&'static [JSPropertySpec]>,
-                                  constants: Option<&'static [ConstantSpec]>) -> *mut JSObject {
+                                  members: &'static NativeProperties) -> *mut JSObject {
     unsafe {
         let ourProto = JS_NewObjectWithUniqueType(cx, protoClass, parentProto, global);
         assert!(ourProto.is_not_null());
 
-        match methods {
+        match members.methods {
             Some(methods) => DefineMethods(cx, ourProto, methods),
             _ => (),
         }
 
-        match properties {
+        match members.attrs {
             Some(properties) => DefineProperties(cx, ourProto, properties),
             _ => (),
         }
 
-        match constants {
+        match members.consts {
             Some(constants) => DefineConstants(cx, ourProto, constants),
             _ => (),
         }