Index: mojo/public/tools/bindings/generators/mojom_cpp_generator.py |
diff --git a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py |
index 38d222b136995a93b668e607594989d1f2771b41..3c29af494f3d41b70afdafa49340e2cc8fde444e 100644 |
--- a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py |
+++ b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py |
@@ -649,8 +649,7 @@ class Generator(generator.Generator): |
"is_union_kind": mojom.IsUnionKind, |
"passes_associated_kinds": mojom.PassesAssociatedKinds, |
"struct_constructors": GetStructConstructors, |
- "stylize_method": generator.StudlyCapsToCamel, |
- "under_to_camel": generator.UnderToCamel, |
+ "under_to_camel": generator.ToCamel, |
"unmapped_type_for_serializer": GetUnmappedTypeForSerializer, |
"wtf_hash_fn_name_for_enum": GetWtfHashFnNameForEnum, |
} |
@@ -734,12 +733,10 @@ class Generator(generator.Generator): |
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 { |
@@ -750,9 +747,9 @@ class Generator(generator.Generator): |
"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(), |
@@ -791,6 +788,8 @@ class Generator(generator.Generator): |
return self.GetJinjaExports() |
def GenerateFiles(self, args): |
+ self.FinalizeModule() |
+ |
if self.generate_non_variant_code: |
self.Write(self.GenerateModuleSharedHeader(), |
self.MatchMojomFilePath("%s-shared.h" % self.module.name)) |