IDL: Defer typedef resolution

Source/bindings/scripts/compute_interfaces_info_individual.py

 #!/usr/bin/python
 #
 # 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.
@@ skipping 135 matching lines @@
         for constructor in interface.constructors:
             this_union_types.update(union_types_from(constructor.arguments))
         for constructor in interface.custom_constructors:
             this_union_types.update(union_types_from(constructor.arguments))
     for callback_function in definitions.callback_functions.itervalues():
         this_union_types.update(union_types_from(callback_function.arguments))
         if callback_function.idl_type.is_union_type:
             this_union_types.add(callback_function.idl_type)
     for dictionary in definitions.dictionaries.itervalues():
         this_union_types.update(union_types_from(dictionary.members))
+    for idl_type in definitions.typedefs.itervalues():
+        if idl_type.is_union_type:
+            this_union_types.add(idl_type)
     return this_union_types
 
 
 class InterfaceInfoCollector(object):
     """A class that collects interface information from idl files."""
     def __init__(self, cache_directory=None):
         self.reader = IdlReader(interfaces_info=None, outputdir=cache_directory)
         self.interfaces_info = {}
         self.partial_interface_files = defaultdict(lambda: {
             'full_paths': [],
             'include_paths': [],
         })
         self.union_types = set()
+        self.typedefs = {}
 
     def add_paths_to_partials_dict(self, partial_interface_name, full_path,
                                    include_paths):
         paths_dict = self.partial_interface_files[partial_interface_name]
         paths_dict['full_paths'].append(full_path)
         paths_dict['include_paths'].extend(include_paths)
 
     def collect_info(self, idl_filename):
         """Reads an idl file and collects information which is required by the
         binding code generation."""
@@ skipping 18 matching lines @@
                 'is_callback_interface': False,
                 'is_dictionary': True,
                 'referenced_interfaces': None,
             }
         else:
             raise Exception('IDL file must contain one interface or dictionary')
 
         this_union_types = collect_union_types_from_definitions(definitions)
         self.union_types.update(this_union_types)
 
+        self.typedefs.update(definitions.typedefs)
+
         extended_attributes = definition.extended_attributes
         implemented_as = extended_attributes.get('ImplementedAs')
         full_path = os.path.realpath(idl_filename)
         this_include_path = None if 'NoImplHeader' in extended_attributes else include_path(idl_filename, implemented_as)
         if definition.is_partial:
             # We don't create interface_info for partial interfaces, but
             # adds paths to another dict.
             partial_include_paths = []
             if this_include_path:
                 partial_include_paths.append(this_include_path)
@@ skipping 32 matching lines @@
         return {
             'interfaces_info': self.interfaces_info,
             # Can't pickle defaultdict, convert to dict
             # FIXME: this should be included in get_component_info.
             'partial_interface_files': dict(self.partial_interface_files),
         }
 
     def get_component_info_as_dict(self):
         """Returns component wide information as a dict."""
         return {
+            'typedefs': self.typedefs,
             'union_types': self.union_types,
         }
 
 
 ################################################################################
 
 def main():
     options, args = parse_options()
 
     # Static IDL files are passed in a file (generated at GYP time), due to OS
@@ skipping 13 matching lines @@
 
     write_pickle_file(options.interfaces_info_file,
                       info_collector.get_info_as_dict(),
                       options.write_file_only_if_changed)
     write_pickle_file(options.component_info_file,
                       info_collector.get_component_info_as_dict(),
                       options.write_file_only_if_changed)
 
 if __name__ == '__main__':
     sys.exit(main())