Mark VoidCallback as a [Callback]

client/dom/scripts/databasebuilder.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import copy
 import database
 import idlparser
 import logging
 import os
@@ skipping 238 matching lines @@
         return
       res.append(current_interface)
       for parent in current_interface.parents:
         parent_name = parent.type.id
         if self._database.HasInterface(parent_name):
           recurse(self._database.GetInterface(parent_name))
 
     recurse(interface)
     return res[1:]
 
+  def _merge_ext_attrs(self, old_attrs, new_attrs):
+    """Merges two sets of extended attributes.
+
+    Returns: True if old_attrs has changed.
+    """
+    changed = False
+    for (name, value) in new_attrs.items():
+      if name in old_attrs and old_attrs[name] == value:
+        pass # Identical
+      else:
+        old_attrs[name] = value
+        changed = True
+    return changed
+
   def _merge_nodes(self, old_list, new_list, import_options):
     """Merges two lists of nodes. Annotates nodes with the source of each
     node.
 
     Returns:
-      True is the old_list has changed.
+      True if the old_list has changed.
 
     Args:
       old_list -- the list to merge into.
       new_list -- list containing more nodes.
       import_options -- controls how merging is done.
     """
     changed = False
 
     source = import_options.source
 
@@ skipping 20 matching lines @@
             new_arg_name = new_node.arguments[i].id
             if (old_arg_name != new_arg_name
                 and (old_arg_name == 'arg'
                      or old_arg_name.endswith('Arg')
                      or import_options.rename_operation_arguments_on_merge)):
               old_node.arguments[i].id = new_arg_name
               changed = True
         # Maybe merge annotations:
         if (isinstance(old_node, IDLAttribute) or
             isinstance(old_node, IDLOperation)):
-          for (name, value) in new_node.ext_attrs.items():
-            if name in old_node.ext_attrs and old_node.ext_attrs[name] == value:
-              pass # Identical
-            else:
-              old_node.ext_attrs[name] = value
-              changed = True
+          if self._merge_ext_attrs(old_node.ext_attrs, new_node.ext_attrs):
+            changed = True
 
     # Remove annotations on obsolete items from the same source
     if import_options.obsolete_old_declarations:
       for (sig, old_node) in old_signatures_map.items():
         if (source in old_node.annotations
             and sig not in new_signatures_map):
           _logger.warn('%s not available in %s anymore' %
             (sig, source))
           del old_node.annotations[source]
           changed = True
@@ skipping 31 matching lines @@
     # Smartly merge various declarations:
     if merge_list('parents'):
       changed = True
     if merge_list('constants'):
       changed = True
     if merge_list('attributes'):
       changed = True
     if merge_list('operations'):
       changed = True
 
+    if self._merge_ext_attrs(old_interface.ext_attrs, new_interface.ext_attrs):
+      changed = True
+
     # Snippets are just concatentated:
     if new_interface.snippets:
       old_interface.snippets.extend(
         copy.deepcopy(new_interface.snippets))
       changed = True
 
     _logger.info('merged interface %s (changed=%s, supplemental=%s)' %
       (old_interface.id, changed, new_interface.is_supplemental))
 
     return changed
@@ skipping 166 matching lines @@
             for name, value in annotation.items():
               if (name in top_level_annotation
                   and value == top_level_annotation[name]):
                 del annotation[name]
 
         map(normalize, interface.parents)
         map(normalize, interface.constants)
         map(normalize, interface.attributes)
         map(normalize, interface.operations)
         map(normalize, interface.snippets)