IDL: Generate union type containers

Tools/Scripts/webkitpy/bindings/main.py

 # Copyright (C) 2011 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:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 22 matching lines @@
 
 from webkitpy.common.system.executive import Executive
 
 # Source/ path is needed both to find input IDL files, and to import other
 # Python modules.
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir,
                                             os.pardir, os.pardir, 'Source'))
 sys.path.append(source_path)  # for Source/bindings imports
 
-from bindings.scripts.code_generator_v8 import CodeGeneratorUnionTypeContainers
+from bindings.scripts.code_generator_v8 import CodeGeneratorUnionType
 import bindings.scripts.compute_interfaces_info_individual
 from bindings.scripts.compute_interfaces_info_individual import InterfaceInfoCollector
 import bindings.scripts.compute_interfaces_info_overall
 from bindings.scripts.compute_interfaces_info_overall import compute_interfaces_info_overall, interfaces_info
 from bindings.scripts.idl_compiler import IdlCompilerDictionaryImpl, IdlCompilerV8
 from bindings.scripts.idl_reader import IdlReader
 from bindings.scripts.utilities import idl_filename_to_component, write_file
 
 
 PASS_MESSAGE = 'All tests PASS!'
@@ skipping 72 matching lines @@
             info_collector.collect_info(idl_path)
         info = info_collector.get_info_as_dict()
         # TestDictionary.{h,cpp} are placed under
         # Source/bindings/tests/idls/core. However, IdlCompiler generates
         # TestDictionary.{h,cpp} by using relative_dir.
         # So the files will be generated under
         # output_dir/core/bindings/tests/idls/core.
         # To avoid this issue, we need to clear relative_dir here.
         for value in info['interfaces_info'].itervalues():
             value['relative_dir'] = ''
+        # Merge component-wide information.
+        component_info = info_collector.get_component_info_as_dict()
+        info.update(component_info)
         return info
 
     # We compute interfaces info for *all* IDL files, not just test IDL
     # files, as code generator output depends on inheritance (both ancestor
     # chain and inherited extended attributes), and some real interfaces
     # are special-cased, such as Node.
     #
     # For example, when testing the behavior of interfaces that inherit
     # from Node, we also need to know that these inherit from EventTarget,
     # since this is also special-cased and Node inherits from EventTarget,
@@ skipping 105 matching lines @@
             if relpath not in generated_files:
                 excess_files.append(relpath)
         if excess_files:
             print ('Excess reference files! '
                   '(probably cruft from renaming or deleting):\n' +
                   '\n'.join(excess_files))
             return False
         return True
 
     def generate_union_type_containers(output_directory, component):
-        generator = CodeGeneratorUnionTypeContainers(
+        generator = CodeGeneratorUnionType(
             interfaces_info, cache_dir=None, output_dir=output_directory,
             target_component=component)
         outputs = generator.generate_code(union_types[component])
         for output_path, output_code in outputs:
             write_file(output_code, output_path, only_if_changed=True)
 
     try:
         generate_interface_dependencies(output_directory)
         for component in COMPONENT_DIRECTORY:
             output_dir = os.path.join(output_directory, component)
@@ skipping 63 matching lines @@
 
 
 def run_bindings_tests(reset_results, verbose):
     # Generate output into the reference directory if resetting results, or
     # a temp directory if not.
     if reset_results:
         print 'Resetting results'
         return bindings_tests(reference_directory, verbose)
     with TemporaryDirectory() as temp_dir:
         return bindings_tests(temp_dir, verbose)