Mojo code generator: change where to add computed data to mojom definitions

mojo/public/tools/bindings/generators/mojom_cpp_generator.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.
 
 """Generates C++ source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 260 matching lines @@
     for struct in self.module.structs + self.module.unions:
       for field in struct.fields:
         yield field.kind
 
     for interface in self.module.interfaces:
       for method in interface.methods:
         for param in method.parameters + (method.response_parameters or []):
           yield param.kind
 
   def _GetJinjaExports(self):
-    structs = self.GetStructs()
-    interfaces = self.GetInterfaces()
     all_enums = list(self.module.enums)
-    for struct in structs:
+    for struct in self.module.structs:
       all_enums.extend(struct.enums)
-    for interface in interfaces:
+    for interface in self.module.interfaces:
       all_enums.extend(interface.enums)
 
     return {
       "module": self.module,
       "namespace": self.module.namespace,
       "namespaces_as_array": NamespaceToArray(self.module.namespace),
       "imports": self.module.imports,
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "all_enums": all_enums,
-      "structs": structs,
-      "unions": self.GetUnions(),
-      "interfaces": interfaces,
+      "structs": self.module.structs,
+      "unions": self.module.unions,
+      "interfaces": self.module.interfaces,
       "variant": self.variant,
       "extra_traits_headers": self._GetExtraTraitsHeaders(),
       "extra_public_headers": self._GetExtraPublicHeaders(),
       "for_blink": self.for_blink,
       "use_once_callback": self.use_once_callback,
       "export_attribute": self.export_attribute,
       "export_header": self.export_header,
     }
 
   @staticmethod
@@ skipping 39 matching lines @@
       "is_map_kind": mojom.IsMapKind,
       "is_nullable_kind": mojom.IsNullableKind,
       "is_object_kind": mojom.IsObjectKind,
       "is_reference_kind": mojom.IsReferenceKind,
       "is_string_kind": mojom.IsStringKind,
       "is_struct_kind": mojom.IsStructKind,
       "is_typemapped_kind": self._IsTypemappedKind,
       "is_union_kind": mojom.IsUnionKind,
       "passes_associated_kinds": mojom.PassesAssociatedKinds,
       "struct_constructors": self._GetStructConstructors,
-      "under_to_camel": generator.UnderToCamel,
+      "under_to_camel": generator.ToCamel,
       "unmapped_type_for_serializer": self._GetUnmappedTypeForSerializer,
       "wtf_hash_fn_name_for_enum": GetWtfHashFnNameForEnum,
     }
     return cpp_filters
 
   @UseJinja("module.h.tmpl")
   def _GenerateModuleHeader(self):
     return self._GetJinjaExports()
 
   @UseJinja("module.cc.tmpl")
@@ skipping 427 matching lines @@
     if mojom.IsDataPipeProducerKind(kind):
       return "mojo::ScopedDataPipeProducerHandle"
     if mojom.IsMessagePipeKind(kind):
       return "mojo::ScopedMessagePipeHandle"
     if mojom.IsSharedBufferKind(kind):
       return "mojo::ScopedSharedBufferHandle"
     return _kind_to_cpp_type[kind]
 
   def _GetUnmappedTypeForSerializer(self, kind):
     return self._GetCppDataViewType(kind, qualified=True)