Merge 38 changes to bleeding edge

tools/dom/scripts/dartgenerator.py

Index: tools/dom/scripts/dartgenerator.py
diff --git a/tools/dom/scripts/dartgenerator.py b/tools/dom/scripts/dartgenerator.py
index 7cb718a4e83c478bcb3e960a36fa314722ff844a..bb96bd3d72e7d8985f54ac568e096e5c2aa97db2 100755
--- a/tools/dom/scripts/dartgenerator.py
+++ b/tools/dom/scripts/dartgenerator.py
@@ -28,7 +28,7 @@ class DartGenerator(object):
 
   def __init__(self, logging_level=logging.WARNING):
     self._auxiliary_files = {}
-    self._dart_templates_re = re.compile(r'[\w.:]+<([\w\.<>:]+)>')
+    self._dart_templates_re = re.compile(r'[\w.:]+<([\w \.<>:]+)>')
     _logger.setLevel(logging_level)
 
   def _StripModules(self, type_name):
@@ -229,9 +229,7 @@ class DartGenerator(object):
     ARG = idlnode.IDLArgument([('Type', ('ScopedName', 'object')), ('Id', 'arg')])
     for interface in database.GetInterfaces():
       for operation in interface.operations:
-        call_with = (operation.ext_attrs.get('CallWith', '').split('|') +
-                     operation.ext_attrs.get('ConstructorCallWith', '').split('|') +
-                     operation.ext_attrs.get('CallWith', '').split('&') +
-                     operation.ext_attrs.get('ConstructorCallWith', '').split('&'))
+        call_with = (operation.ext_attrs.get('CallWith', '') +
+                     operation.ext_attrs.get('ConstructorCallWith', ''))
         if 'ScriptArguments' in call_with:
           operation.arguments.append(ARG)