Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: lib/dom/scripts/databasebuilder.py

Issue 10829008: Communication optionality of priority in CSSStyleDeclaration.setProperty via dart.idl. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/dom/idl/dart/dart.idl ('k') | lib/dom/scripts/fremontcutbuilder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/dom/scripts/databasebuilder.py
diff --git a/lib/dom/scripts/databasebuilder.py b/lib/dom/scripts/databasebuilder.py
index 8021ea4cc3797a8e1614d52c828bfbf3f1a713d7..9c4726e5a08c106e31bed6168d184746805d882a 100755
--- a/lib/dom/scripts/databasebuilder.py
+++ b/lib/dom/scripts/databasebuilder.py
@@ -271,14 +271,20 @@ class DatabaseBuilder(object):
# 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)):
@@ -375,17 +381,11 @@ class DatabaseBuilder(object):
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
« no previous file with comments | « lib/dom/idl/dart/dart.idl ('k') | lib/dom/scripts/fremontcutbuilder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698