Chrome roll 202464->204370.

tools/dom/scripts/systemnative.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 provides shared functionality for the systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 558 matching lines @@
         stmts_emitter, call_emitter, version, operation, argument_count):
       overload_name = '_%s_%s' % (operation.id, version)
       argument_list = ', '.join(
           [p.name for p in info.param_infos[:argument_count]])
       call_emitter.Emit('$NAME($ARGS)', NAME=overload_name, ARGS=argument_list)
 
       dart_declaration = '%s%s %s(%s)' % (
           'static ' if operation.is_static else '',
           self.SecureOutputType(operation.type.id),
           overload_name, argument_list)
+      is_custom = 'Custom' in operation.ext_attrs
       cpp_callback_name = self._GenerateNativeBinding(
           overload_name, (0 if operation.is_static else 1) + argument_count,
-          dart_declaration, 'Callback', False, False)
-      self._GenerateOperationNativeCallback(operation, operation.arguments[:argument_count], cpp_callback_name)
+          dart_declaration, 'Callback', is_custom, emit_metadata=False)
+      if not is_custom:
+        self._GenerateOperationNativeCallback(operation, operation.arguments[:argument_count], cpp_callback_name)
 
     self._GenerateDispatcherBody(
         info,
         operations,
         dart_declaration,
         GenerateCall,
         self._IsArgumentOptionalInWebCore)
 
   def SecondaryContext(self, interface):
     pass
@@ skipping 187 matching lines @@
           '            goto fail;\n'
           '        RefPtr<ScriptCallStack> scriptCallStack(DartUtilities::createScriptCallStack());\n'
           '        if (!scriptCallStack->size())\n'
           '            return;\n',
           INDEX=len(arguments) + 1)
 
     # Emit arguments.
     start_index = 1 if needs_receiver else 0
     for i, argument in enumerate(arguments):
       type_info = self._TypeInfo(argument.type.id)
+      self._cpp_impl_includes |= set(type_info.conversion_includes())
       argument_expression_template, type, cls, function = \
           type_info.to_native_info(argument, self._interface.id)
 
       def AllowsNull():
         assert argument.ext_attrs.get('TreatNullAs', 'NullString') == 'NullString'
         if argument.ext_attrs.get('TreatNullAs') == 'NullString':
           return True
 
         if argument.type.nullable:
           return True
@@ skipping 225 matching lines @@
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')