Roll 50: Copied IDLs, PYTHON scripts from WebKit removed deleted files in WebCore

bindings/scripts/compute_interfaces_info_overall.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 68 matching lines @@
 code changes (for inherited extended attributes).
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-build
 """
 
 from collections import defaultdict
 import cPickle as pickle
 import optparse
 import sys
 
-from utilities import idl_filename_to_component, read_pickle_files, write_pickle_file
+from utilities import idl_filename_to_component, read_pickle_files, write_pickle_file, merge_dict_recursively
 
 INHERITED_EXTENDED_ATTRIBUTES = set([
-    'ActiveDOMObject',
     'DependentLifetime',
-    'DoNotExposeJSAccessors',
-    'ExposeJSAccessors',
     'GarbageCollected',
     'WillBeGarbageCollected',
 ])
 
 # Main variable (filled in and exported)
 interfaces_info = {}
 
 # Auxiliary variables (not visible to future build steps)
 partial_interface_files = defaultdict(lambda: {
     'full_paths': [],
@@ skipping 95 matching lines @@
     interfaces_info['will_be_garbage_collected_interfaces'] = will_be_garbage_collected_interfaces
     interfaces_info['component_dirs'] = component_dirs
 
 
 def compute_interfaces_info_overall(info_individuals):
     """Compute information about IDL files.
 
     Information is stored in global interfaces_info.
     """
     for info in info_individuals:
-        # No overlap between interface names, so ok to use dict.update
-        interfaces_info.update(info['interfaces_info'])
+        merge_dict_recursively(interfaces_info, info['interfaces_info'])
         # Interfaces in one component may have partial interfaces in
         # another component. This is ok (not a layering violation), since
         # partial interfaces are used to *extend* interfaces.
         # We thus need to update or append if already present
         dict_of_dicts_of_lists_update_or_append(
                 partial_interface_files, info['partial_interface_files'])
 
     # Record inheritance information individually
     for interface_name, interface_info in interfaces_info.iteritems():
         extended_attributes = interface_info['extended_attributes']
@@ skipping 85 matching lines @@
                 dependencies_other_component_full_paths,
             'dependencies_other_component_include_paths':
                 dependencies_other_component_include_paths,
         })
 
     # Clean up temporary private information
     for interface_info in interfaces_info.itervalues():
         del interface_info['extended_attributes']
         del interface_info['has_union_types']
         del interface_info['is_legacy_treat_as_partial_interface']
-        del interface_info['parent']
 
     # Compute global_type_info to interfaces_info so that idl_compiler does
     # not need to always calculate the info in __init__.
     compute_global_type_info()
 
 
 ################################################################################
 
 def main():
     options, args = parse_options()
     # args = Input1, Input2, ..., Output
     interfaces_info_filename = args.pop()
     info_individuals = read_pickle_files(args)
 
     compute_interfaces_info_overall(info_individuals)
     write_pickle_file(interfaces_info_filename,
                       interfaces_info,
                       options.write_file_only_if_changed)
 
 
 if __name__ == '__main__':
     sys.exit(main())