MERGE: 152953-155080

tools/dom/scripts/dartgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2012, 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.
 
 """This module generates Dart APIs from the IDL database."""
 
 import emitter
 import idlnode
 import logging
@@ skipping 196 matching lines @@
       if 'EventTarget' in interface.ext_attrs and interface.id != 'EventTarget':
         ast = [('Annotation', [('Id', 'WebKit')]),
                ('InterfaceType', ('ScopedName', 'EventTarget'))]
         interface.parents.append(idlnode.IDLParentInterface(ast))
 
   def AddMissingArguments(self, database):
     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('ConstructorCallWith', '').split('|') +
+                     operation.ext_attrs.get('CallWith', '').split('&') +
+                     operation.ext_attrs.get('ConstructorCallWith', '').split('&'))
         if 'ScriptArguments' in call_with:
           operation.arguments.append(ARG)