Refactor interface dependency resolution

Source/bindings/scripts/idl_definitions.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 130 matching lines @@
         # Resolve typedefs with the actual types and then discard the Typedefs.
         # http://www.w3.org/TR/WebIDL/#idl-typedefs
         self.resolve_typedefs(typedefs)
 
     def resolve_typedefs(self, typedefs):
         for callback_function in self.callback_functions.itervalues():
             callback_function.resolve_typedefs(typedefs)
         for interface in self.interfaces.itervalues():
             interface.resolve_typedefs(typedefs)
 
+    def update(self, other):
+        """Update with additional IdlDefinitions."""
+        for interface_name, new_interface in other.interfaces.iteritems():
+            if not new_interface.is_partial:
+                # Add as new interface
+                self.interfaces[interface_name] = new_interface
+                continue
+
+            # Merge partial to existing interface
+            try:
+                self.interfaces[interface_name].merge(new_interface)
+            except KeyError:
+                raise Exception('Tried to merge partial interface for {0}, '
+                                'but no existing interface by that name'
+                                .format(interface_name))
+
 
 ################################################################################
 # Callback Functions
 ################################################################################
 
 class IdlCallbackFunction(TypedObject):
     def __init__(self, node):
         children = node.GetChildren()
         num_children = len(children)
         if num_children != 2:
@@ skipping 73 matching lines @@
             attribute.resolve_typedefs(typedefs)
         for constant in self.constants:
             constant.resolve_typedefs(typedefs)
         for constructor in self.constructors:
             constructor.resolve_typedefs(typedefs)
         for custom_constructor in self.custom_constructors:
             custom_constructor.resolve_typedefs(typedefs)
         for operation in self.operations:
             operation.resolve_typedefs(typedefs)
 
+    def merge(self, other):
+        """Merge in another interface's members (e.g., partial interface)"""
+        self.attributes.extend(other.attributes)
+        self.constants.extend(other.constants)
+        self.operations.extend(other.operations)
+
 
 class IdlException(IdlInterface):
     # Properly exceptions and interfaces are distinct, and thus should inherit a
     # common base class (say, "IdlExceptionOrInterface").
     # However, there is only one exception (DOMException), and new exceptions
     # are not expected. Thus it is easier to implement exceptions as a
     # restricted subclass of interfaces.
     # http://www.w3.org/TR/WebIDL/#idl-exceptions
     def __init__(self, node):
         # Exceptions are similar to Interfaces, but simpler
@@ skipping 366 matching lines @@
     child_class = child.GetClass()
     if child_class != 'Type':
         raise ValueError('Unrecognized node class: %s' % child_class)
     return type_node_to_type(child)
 
 
 def union_type_node_to_idl_union_type(node, is_nullable=False):
     member_types = [type_node_to_type(member_type_node)
                     for member_type_node in node.GetChildren()]
     return IdlUnionType(member_types, is_nullable=is_nullable)