Communication optionality of priority in CSSStyleDeclaration.setProperty via dart.idl.

lib/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 253 matching lines @@
       else:
         # Merge old and new nodes:
         old_node = old_signatures_map[sig]
         if (source not in old_node.annotations
             and source in new_node.annotations):
           old_node.annotations[source] = new_node.annotations[source]
           changed = True
         # Maybe rename arguments:
         if isinstance(old_node, IDLOperation):
           for i in range(0, len(old_node.arguments)):
-            old_arg_name = old_node.arguments[i].id
-            new_arg_name = new_node.arguments[i].id
+            old_arg = old_node.arguments[i]
+            new_arg = new_node.arguments[i]
+
+            old_arg_name = old_arg.id
+            new_arg_name = new_arg.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
+
+            if self._merge_ext_attrs(old_arg.ext_attrs, new_arg.ext_attrs):
+              changed = True
         # Maybe merge annotations:
         if (isinstance(old_node, IDLAttribute) or
             isinstance(old_node, IDLOperation)):
           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
@@ skipping 76 matching lines @@
                 import_options.source_attributes)
           return
       # not found, so add new one
       parent = IDLParentInterface(None)
       parent.type = IDLType(implemented_name)
       if source:
         parent.annotations[source] = IDLAnnotation(
             import_options.source_attributes)
       interface.parents.append(parent)
 
-  def merge_imported_interfaces(self, optional_argument_whitelist):
+  def merge_imported_interfaces(self):
     """Merges all imported interfaces and loads them into the DB."""
 
     # Step 1: Pre process imported interfaces
     for interface, module_name, import_options in self._imported_interfaces:
-      # Add 'Optional' attribute to whitelisted arguments.
-      for op in interface.operations:
-        for argument in op.arguments:
-          in_optional_whitelist = (interface.id, op.id, argument.id) in optional_argument_whitelist
-          if in_optional_whitelist:
-            argument.ext_attrs['Optional'] = None
       self._annotate(interface, module_name, import_options)
 
     # Step 2: Add all new interfaces and merge overlapping ones
     for interface, module_name, import_options in self._imported_interfaces:
       if not interface.is_supplemental:
         if self._database.HasInterface(interface.id):
           old_interface = self._database.GetInterface(interface.id)
           self._merge_interfaces(old_interface, interface, import_options)
         else:
           if import_options.add_new_interfaces:
@@ skipping 151 matching lines @@
       # TODO(antonm): Ideally we'd like to have pristine copy of WebKit IDLs and fetch
       # this information directly from it.  Unfortunately right now database is massaged
       # a lot so it's difficult to maintain necessary information on DOMWindow itself.
       interface = self._database.GetInterface(options.type_rename_map.get(type, type))
       if 'V8EnabledPerContext' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledPerContext'] = \
             attr.ext_attrs['V8EnabledPerContext']
       if 'V8EnabledAtRuntime' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledAtRuntime'] = \
             attr.ext_attrs['V8EnabledAtRuntime'] or attr.id