Add support for enums within structs and interfaces to mojom.

mojo/public/bindings/generators/mojom_data.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import mojom
 
 # mojom_data provides a mechanism to turn mojom Modules to dictionaries and
 # back again. This can be used to persist a mojom Module created progromatically
 # or to read a dictionary from code or a file.
 # Example:
@@ skipping 48 matching lines @@
     istr(0, 'name'): struct.name,
     istr(1, 'fields'): map(FieldToData, struct.fields)
   }
 
 def StructFromData(kinds, data):
   struct = mojom.Struct()
   struct.name = data['name']
   struct.spec = 'x:' + struct.name
   kinds[struct.spec] = struct
   struct.fields = map(lambda field: FieldFromData(kinds, field), data['fields'])
+  struct.enums = map(lambda enum: EnumFromData(kinds, enum), data['enums'])
   return struct
 
 def FieldToData(field):
   data = {
     istr(0, 'name'): field.name,
     istr(1, 'kind'): KindToData(field.kind)
   }
   if field.ordinal != None:
     data[istr(2, 'ordinal')] = field.ordinal
   if field.default != None:
@@ skipping 51 matching lines @@
     istr(1, 'peer'):    interface.peer,
     istr(2, 'methods'): map(MethodToData, interface.methods)
   }
 
 def InterfaceFromData(kinds, data):
   interface = mojom.Interface()
   interface.name = data['name']
   interface.peer = data['peer']
   interface.methods = map(
     lambda method: MethodFromData(kinds, method), data['methods'])
+  interface.enums = map(lambda enum: EnumFromData(kinds, enum), data['enums'])
   return interface
 
 def EnumFieldFromData(kinds, data):
   field = mojom.EnumField()
   field.name = data['name']
   field.value = data['value']
   return field
 
 def EnumFromData(kinds, data):
   enum = mojom.Enum()
@@ skipping 29 matching lines @@
 def OrderedModuleFromData(data):
   module = ModuleFromData(data)
   next_interface_ordinal = 0
   for interface in module.interfaces:
     next_ordinal = 0
     for method in interface.methods:
       if method.ordinal is None:
         method.ordinal = next_ordinal
       next_ordinal = method.ordinal + 1
   return module