Suppport DartCustom for proper native callback

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
 from generator import *
 from htmldartgenerator import *
-from idlnode import IDLArgument, IDLAttribute, IDLEnum
+from idlnode import IDLArgument, IDLAttribute, IDLEnum, IDLMember
 from systemhtml import js_support_checks, GetCallbackInfo, HTML_LIBRARY_NAMES
 
 # This is an ugly hack to get things working on the M35 roll.  Once we
 # generate dart:blink from the new scripts, this shouldn't be needed.
 _cpp_resolver_string_map = {
     # These custom constructors all resolve to a common entry, so choosing any
     # of the generated strings works.
     'ConsoleBase_assertCondition_Callback_boolean_object':
         'ConsoleBase_assert_Callback_boolean_object',
     'FormData_constructorCallback':
@@ skipping 488 matching lines @@
             PARAMETERS=', '.join(parameters))
         continue
 
       cpp_header_handlers_emitter.Emit(
           '\n'
           '    virtual $RETURN_TYPE $FUNCTION($PARAMETERS);\n',
           RETURN_TYPE=return_type,
           FUNCTION=function_name,
           PARAMETERS=', '.join(parameters))
 
-      if 'Custom' in operation.ext_attrs:
+      if _IsCustom(operation):
         continue
 
       cpp_impl_includes |= set(conversion_includes)
       arguments_declaration = 'Dart_Handle arguments[] = { %s }' % ', '.join(arguments)
       if not len(arguments):
         arguments_declaration = 'Dart_Handle* arguments = 0'
       if (return_type == 'void'):
         ret1 = 'return'
         ret2 = ''
       else:
@@ skipping 449 matching lines @@
 
   def _AddGetter(self, attr, html_name, read_only):
     # Temporary hack to force dart:scalarlist clamped array for ImageData.data.
     # TODO(antonm): solve in principled way.
     if self._interface.id == 'ImageData' and html_name == 'data':
       html_name = '_data'
     type_info = self._TypeInfo(attr.type.id)
     return_type = self.SecureOutputType(attr.type.id, False, read_only)
     parameters = []
     dart_declaration = '%s get %s' % (return_type, html_name)
-    is_custom = ('Custom' in attr.ext_attrs and
-                 (attr.ext_attrs['Custom'] == None or
-                  attr.ext_attrs['Custom'] == 'Getter'))
+    is_custom = _IsCustom(attr) and (_IsCustomValue(attr, None) or
+                                     _IsCustomValue(attr, 'Getter'))
     # This seems to have been replaced with Custom=Getter (see above), but
     # check to be sure we don't see the old syntax
     assert(not ('CustomGetter' in attr.ext_attrs))
     native_suffix = 'Getter'
     auto_scope_setup = self._GenerateAutoSetupScope(attr.id, native_suffix)
     native_entry = \
         self.DeriveNativeEntry(attr.id, native_suffix, [], True)
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 1,
         dart_declaration, False, return_type, parameters,
         native_suffix, is_custom, auto_scope_setup, native_entry=native_entry)
@@ skipping 32 matching lines @@
         attr.type.nullable,
         raises,
         auto_scope_setup)
 
   def _AddSetter(self, attr, html_name):
     type_info = self._TypeInfo(attr.type.id)
     return_type = 'void'
     parameters = ['value']
     ptype = self._DartType(attr.type.id)
     dart_declaration = 'void set %s(%s value)' % (html_name, ptype)
-    is_custom = ('Custom' in attr.ext_attrs and
-                 (attr.ext_attrs['Custom'] == None or
-                  attr.ext_attrs['Custom'] == 'Setter'))
+    is_custom = _IsCustom(attr) and (_IsCustomValue(attr, None) or
+                                     _IsCustomValue(attr, 'Setter'))
     # This seems to have been replaced with Custom=Setter (see above), but
     # check to be sure we don't see the old syntax
     assert(not ('CustomSetter' in attr.ext_attrs))
     assert(not ('V8CustomSetter' in attr.ext_attrs))
     native_suffix = 'Setter'
     auto_scope_setup = self._GenerateAutoSetupScope(attr.id, native_suffix)
     native_entry = \
         self.DeriveNativeEntry(attr.id, native_suffix, [attr.type.id], True)
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 2,
         dart_declaration, False, return_type, parameters,
@@ skipping 46 matching lines @@
     # and
     #
     #   class YImpl extends ListBase<T> { copies of transitive XImpl methods; }
     #
     dart_element_type = self._DartType(element_type)
     if self._HasNativeIndexGetter():
       self._EmitNativeIndexGetter(dart_element_type)
     elif self._HasExplicitIndexedGetter():
       self._EmitExplicitIndexedGetter(dart_element_type)
     else:
-      is_custom = any((op.id == 'item' and 'Custom' in op.ext_attrs) for op in self._interface.operations)
+      is_custom = any((op.id == 'item' and _IsCustom(op)) for op in self._interface.operations)
       # First emit a toplevel function to do the native call
       # Calls to this are emitted elsewhere,
       dart_native_name, resolver_string = \
           self.DeriveNativeEntry("item", "Callback", ["unsigned long"],
                                  is_custom)
       if resolver_string in _cpp_resolver_string_map:
           resolver_string = \
               _cpp_resolver_string_map[resolver_string]
 
       # Emit the method which calls the toplevel function, along with
@@ skipping 89 matching lines @@
     return_type = self.SecureOutputType(info.type_name, False, True)
     formals = info.ParametersAsDeclaration(self._DartType)
     parameters = info.ParametersAsListOfVariables()
     dart_declaration = '%s%s %s(%s)' % (
         'static ' if info.IsStatic() else '',
         return_type,
         html_name,
         formals)
 
     operation = info.operations[0]
-    is_custom = 'Custom' in operation.ext_attrs
+    is_custom = _IsCustom(operation)
     has_optional_arguments = any(self._IsArgumentOptionalInWebCore(operation, argument) for argument in operation.arguments)
     needs_dispatcher = not is_custom and (len(info.operations) > 1 or has_optional_arguments)
 
     if info.callback_args:
       self._AddFutureifiedOperation(info, html_name)
     elif not needs_dispatcher:
       # Bind directly to native implementation
       argument_count = (0 if info.IsStatic() else 1) + len(info.param_infos)
       native_suffix = 'Callback'
       auto_scope_setup = self._GenerateAutoSetupScope(info.name, native_suffix)
@@ skipping 15 matching lines @@
   def _GenerateDispatcher(self, info, operations, dart_declaration, html_name):
 
     def GenerateCall(
         stmts_emitter, call_emitter, version, operation, argument_count):
       native_suffix = 'Callback'
       actuals = info.ParametersAsListOfVariables(argument_count)
       actuals_s = ", ".join(actuals)
       formals=actuals
       return_type = self.SecureOutputType(operation.type.id)
       native_suffix = 'Callback'
-      is_custom = 'Custom' in operation.ext_attrs
+      is_custom = _IsCustom(operation)
       base_name = '_%s_%s' % (operation.id, version)
       static = True
       if not operation.is_static:
         actuals = ['this'] + actuals
         formals = ['mthis'] + formals
       actuals_s = ", ".join(actuals)
       formals_s = ", ".join(formals)
       dart_declaration = '%s(%s)' % (
         base_name, formals_s)
       type_ids = [argument.type.id
@@ skipping 720 matching lines @@
     e.Emit("};\n");
     e.Emit('\n');
     e.Emit('} // namespace WebCore\n');
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.default_value == 'Undefined' and
       argument.type.id == 'DOMString')
+
+def _IsCustom(op_or_attr):
+  assert(isinstance(op_or_attr, IDLMember))
+  return 'Custom' in op_or_attr.ext_attrs or 'DartCustom' in op_or_attr.ext_attrs
+
+def _IsCustomValue(op_or_attr, value):
+  if _IsCustom(op_or_attr):
+    return op_or_attr.ext_attrs.get('Custom') == value \
+           or op_or_attr.ext_attrs.get('DartCustom') == value
+  return False