[Bindings] Pass files to compute_interfaces_info_individual.py in one way

third_party/WebKit/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 32 matching lines @@
 
 from collections import defaultdict
 import optparse
 import os
 import posixpath
 import sys
 
 from idl_compiler import idl_filename_to_interface_name
 from idl_definitions import Visitor
 from idl_reader import IdlReader
-from utilities import get_file_contents, read_file_to_list, idl_filename_to_interface_name, idl_filename_to_component, write_pickle_file, get_interface_extended_attributes_from_idl, is_callback_interface_from_idl, merge_dict_recursively, shorten_union_name
+from utilities import idl_filename_to_component
+from utilities import idl_filename_to_interface_name
+from utilities import merge_dict_recursively
+from utilities import read_idl_files_list_from_file
+from utilities import shorten_union_name
+from utilities import write_pickle_file
+
 
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir))
 gen_path = os.path.join('gen', 'blink')
 
 
 class IdlBadFilenameError(Exception):
     """Raised if an IDL filename disagrees with the interface name in the file."""
     pass
 
 
 def parse_options():
-    usage = 'Usage: %prog [options] [generated1.idl]...'
+    usage = 'Usage: %prog [options]'
     parser = optparse.OptionParser(usage=usage)
     parser.add_option('--cache-directory', help='cache directory')
     parser.add_option('--idl-files-list', help='file listing IDL files')
     parser.add_option('--interfaces-info-file', help='interface info pickle file')
     parser.add_option('--component-info-file', help='component wide info pickle file')
     parser.add_option('--write-file-only-if-changed', type='int', help='if true, do not write an output file if it would be identical to the existing one, which avoids unnecessary rebuilds in ninja')
 
     options, args = parser.parse_args()
     if options.interfaces_info_file is None:
         parser.error('Must specify an output file using --interfaces-info-file.')
@@ skipping 257 matching lines @@
             'enumerations': dict((enum.name, enum.values)
                                  for enum in self.enumerations),
             'typedefs': self.typedefs,
             'union_types': self.union_types,
         }
 
 
 ################################################################################
 
 def main():
-    options, args = parse_options()
+    options, _ = parse_options()
 
-    # Static IDL files are passed in a file (generated at GYP time), due to OS
-    # command line length limits
-    idl_files = read_file_to_list(options.idl_files_list)
-    # Generated IDL files are passed at the command line, since these are in the
-    # build directory, which is determined at build time, not GYP time, so these
-    # cannot be included in the file listing static files
-    idl_files.extend(args)
+    # IDL files are passed in a file, due to OS command line length limits
+    idl_files = read_idl_files_list_from_file(options.idl_files_list, is_gyp_format=False)
 
     # Compute information for individual files
     # Information is stored in global variables interfaces_info and
     # partial_interface_files.
     info_collector = InterfaceInfoCollector(options.cache_directory)
     for idl_filename in idl_files:
         info_collector.collect_info(idl_filename)
 
     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())