bindings: Expand typedefs before generating union files.

third_party/WebKit/Source/bindings/scripts/code_generator_v8.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 269 matching lines @@
 
 class CodeGeneratorUnionType(CodeGeneratorBase):
     """Generates union type container classes.
     This generator is different from CodeGeneratorV8 and
     CodeGeneratorDictionaryImpl. It assumes that all union types are already
     collected. It doesn't process idl files directly.
     """
     def __init__(self, info_provider, cache_dir, output_dir, target_component):
         CodeGeneratorBase.__init__(self, MODULE_PYNAME, info_provider, cache_dir, output_dir)
         self.target_component = target_component
+        # The code below duplicates parts of TypedefResolver. We do not use it
+        # directly because IdlUnionType is not a type defined in
+        # idl_definitions.py. What we do instead is to resolve typedefs in
+        # _generate_container_code() whenever a new union file is generated.
+        self.typedefs = {}

[bashi, 2017/03/15 23:27:11]

Could you explain why do you need to set |typedef| as an instance member? Can we
move this into _generate_container_code()?

[Raphael Kubo da Costa (rakuco), 2017/03/16 08:04:48]

Just to avoid having to iterate through self.info_provider.typedefs on every
_generate_container_code() invocation (which depends on the number of unions we
have) instead of just once when the class is created.

+        for name, typedef in self.info_provider.typedefs.iteritems():
+            self.typedefs[name] = typedef.idl_type
 
     def _generate_container_code(self, union_type):
+        union_type = union_type.resolve_typedefs(self.typedefs)
         header_template = self.jinja_env.get_template('union_container.h.tmpl')
         cpp_template = self.jinja_env.get_template('union_container.cpp.tmpl')
         template_context = v8_union.container_context(
             union_type, self.info_provider.interfaces_info)
         template_context['header_includes'].append(
             self.info_provider.include_path_for_export)
         template_context['header_includes'] = normalize_and_sort_includes(
             template_context['header_includes'])
         template_context['code_generator'] = self.generator_name
         template_context['exported'] = self.info_provider.specifier_for_export
@@ skipping 71 matching lines @@
         outputs = set()
         for callback_function_dict in callback_functions.itervalues():
             if callback_function_dict['component_dir'] != self.target_component:
                 continue
             callback_function = callback_function_dict['callback_function']
             if 'Custom' in callback_function.extended_attributes:
                 continue
             path = callback_function_dict['full_path']
             outputs.update(self.generate_code_internal(callback_function, path))
         return outputs