Bindings: inherit enums and callbacks from partial interface files.

Source/bindings/scripts/interface_dependency_resolver.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 88 matching lines @@
         if interface_name not in self.interfaces_info:
             # No dependencies, nothing to do
             return
 
         interface_info = self.interfaces_info[interface_name]
         if 'inherited_extended_attributes' in interface_info:
             target_interface.extended_attributes.update(
                 interface_info['inherited_extended_attributes'])
 
         merge_interface_dependencies(target_interface,
+                                     definitions,
                                      interface_info['dependencies_full_paths'],
                                      self.reader)
 
         for referenced_interface_name in interface_info['referenced_interfaces']:
             referenced_definitions = self.reader.read_idl_definitions(
                 self.interfaces_info[referenced_interface_name]['full_path'])
             definitions.interfaces.update(referenced_definitions.interfaces)
 
 
-def merge_interface_dependencies(target_interface, dependency_idl_filenames, reader):
-    """Merge dependencies ('partial interface' and 'implements') in dependency_idl_filenames into target_interface.
+def merge_interface_dependencies(target_interface, definitions, dependency_idl_filenames, reader):
+    """Merge dependencies ('partial interface' and 'implements') in dependency_idl_filenames into target_interface and definitions.
 
-    No return: modifies target_interface in place.
+    No return: modifies target_interface and definitions in place.
     """
     # Sort so order consistent, so can compare output from run to run.
     for dependency_idl_filename in sorted(dependency_idl_filenames):
         dependency_interface_basename, _ = os.path.splitext(os.path.basename(dependency_idl_filename))
-        definitions = reader.read_idl_file(dependency_idl_filename)
+        dependency_definitions = reader.read_idl_file(dependency_idl_filename)
 
-        for dependency_interface in definitions.interfaces.itervalues():
+        definitions.merge(dependency_definitions)
+
+        for dependency_interface in dependency_definitions.interfaces.itervalues():
             # Dependency files contain either partial interfaces for
             # the (single) target interface, in which case the interface names
             # must agree, or interfaces that are implemented by the target
             # interface, in which case the interface names differ.
             if (dependency_interface.is_partial and
                 dependency_interface.name != target_interface.name):
                 raise InvalidPartialInterfaceError('%s is not a partial interface of %s. There maybe a bug in the the dependency generator (compute_dependencies.py).' % (dependency_idl_filename, target_interface.name))
             merge_dependency_interface(target_interface, dependency_interface, dependency_interface_basename)
 
 
@@ skipping 30 matching lines @@
             'ImplementedAs', dependency_interface_basename))
 
     def merge_lists(source_list, target_list):
         for member in source_list:
             member.extended_attributes.update(merged_extended_attributes)
         target_list.extend(source_list)
 
     merge_lists(dependency_interface.attributes, target_interface.attributes)
     merge_lists(dependency_interface.constants, target_interface.constants)
     merge_lists(dependency_interface.operations, target_interface.operations)