Remove ParameterAdapters for bindings classes.

lib/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 369 matching lines @@
         CALLBACKS=self._cpp_definitions_emitter.Fragments(),
         RESOLVER=self._cpp_resolver_emitter.Fragments())
 
   def _GenerateCppHeader(self):
     to_native_emitter = emitter.Emitter()
     if self._interface_type_info.custom_to_native():
       to_native_emitter.Emit(
           '    static PassRefPtr<NativeType> toNative(Dart_Handle handle, Dart_Handle& exception);\n')
     else:
       to_native_emitter.Emit(
-          '    static PassRefPtr<NativeType> toNative(Dart_Handle handle, Dart_Handle& exception)\n'
+          '    static NativeType* toNative(Dart_Handle handle, Dart_Handle& exception)\n'
           '    {\n'
           '        return DartDOMWrapper::unwrapDartWrapper<Dart$INTERFACE>(handle, exception);\n'
           '    }\n',
           INTERFACE=self._interface.id)
 
     to_dart_emitter = emitter.Emitter()
     if ('CustomToJS' in self._interface.ext_attrs or
         'CustomToJSObject' in self._interface.ext_attrs or
         'PureInterface' in self._interface.ext_attrs or
         'CPPPureInterface' in self._interface.ext_attrs or
@@ skipping 130 matching lines @@
       arguments.append(self._GenerateWebCoreReflectionAttributeName(attr))
     else:
       webcore_function_name = re.sub(r'^(xml(?=[A-Z])|\w)',
                                      lambda s: s.group(1).upper(),
                                      attr.id)
       webcore_function_name = 'set%s' % webcore_function_name
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
     argument_expression = self._GenerateParameterAdapter(
-        parameter_definitions_emitter, attr, 0, adapter_name='value')
+        parameter_definitions_emitter, attr, 0, argument_name='value')
     arguments.append(argument_expression)
 
     parameter_definitions = parameter_definitions_emitter.Fragments()
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     invocation = self._GenerateWebCoreInvocation(function_expression,
         arguments, 'void', attr.ext_attrs, attr.set_raises)
 
     self._GenerateNativeCallback(cpp_callback_name, parameter_definitions_emitter.Fragments(),
         True, invocation, raises_exceptions=True)
 
@@ skipping 144 matching lines @@
         '    {\n'
         '$PARAMETER_DEFINITIONS'
         '$INVOCATION'
         '        return;\n'
         '    }\n',
         PARAMETER_DEFINITIONS=parameter_definitions,
         INVOCATION=invocation)
 
     if raises_exceptions:
       body = emitter.Format(
-          '    Dart_Handle exception;\n'
+          '    Dart_Handle exception = 0;\n'
           '$BODY'
           '\n'
           'fail:\n'
           '    Dart_ThrowException(exception);\n'
           '    ASSERT_NOT_REACHED();\n',
           BODY=body)
 
     self._cpp_definitions_emitter.Emit(
         '\n'
         'static void $CALLBACK_NAME(Dart_NativeArguments args)\n'
         '{\n'
         '    DartApiScope dartApiScope;\n'
         '$BODY'
         '}\n',
         CALLBACK_NAME=callback_name,
         BODY=body)
 
   def _GenerateParameterAdapter(self, emitter, idl_node, index,
-                                adapter_name=None):
+                                argument_name=None):
     """idl_node is IDLArgument or IDLAttribute."""
     type_info = GetIDLTypeInfo(idl_node.type.id)
     (adapter_type, include_name) = type_info.parameter_adapter_info()
     if include_name:
       self._cpp_impl_includes.add(include_name)
-    adapter_name = adapter_name or idl_node.id
+    argument_name = argument_name or idl_node.id
     flags = ''
     if (idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString' or
         'RequiredCppParameter' in idl_node.ext_attrs):
       flags = ', DartUtilities::ConvertNullToDefaultValue'
+
+    if isinstance(type_info, PrimitiveIDLTypeInfo):
+      emitter.Emit(

[Anton Muhin, 2012/05/03 18:27:50]

shouldn't it be a polymorphic method or something?

[podivilov, 2012/05/03 18:44:19]

Probably not, because it uses too much of a context. I think it's better to keep
this code here.

+          '\n'
+          '        const $ADAPTER_TYPE $NAME(Dart_GetNativeArgument(args, $INDEX)$FLAGS);\n'
+          '        if (!$NAME.conversionSuccessful()) {\n'
+          '            exception = $NAME.exception();\n'
+          '            goto fail;\n'
+          '        }\n',
+          ADAPTER_TYPE=adapter_type,
+          NAME=argument_name,
+          INDEX=index + 1,
+          FLAGS=flags)
+      return argument_name
+
+    if 'Callback' in idl_node.ext_attrs:
+      type = 'RefPtr<%s>' % type_info.native_type()
+      conversion = '%s'
+    elif type_info.custom_to_native():
+      type = 'RefPtr<%s>' % type_info.native_type()
+      conversion = '%s.get()'
+    else:
+      type = '%s*' % type_info.native_type()
+      if isinstance(type_info, SVGTearOffIDLTypeInfo) and not self._interface.id.endswith('List'):
+        conversion = '%s->propertyReference()'
+      else:#if type_info.idl_type() == 'SVGMatrix' and self._interface.id == 'SVGTransformList':
+        conversion = '%s'
+
     emitter.Emit(
         '\n'
-        '        const $ADAPTER_TYPE $NAME(Dart_GetNativeArgument(args, $INDEX)$FLAGS);\n'
-        '        if (!$NAME.conversionSuccessful()) {\n'
-        '            exception = $NAME.exception();\n'
-        '            goto fail;\n'
-        '        }\n',
-        ADAPTER_TYPE=adapter_type,
-        NAME=adapter_name,
-        INDEX=index + 1,
-        FLAGS=flags)
-
-    conversion = '%s'
-    if isinstance(type_info, SVGTearOffIDLTypeInfo) and not self._interface.id.endswith('List'):
-      conversion = '%s.get()->propertyReference()'
-    elif type_info.idl_type() == 'SVGMatrix' and self._interface.id == 'SVGTransformList':
-      conversion = '%s.get()'
-    return conversion % adapter_name
+        '        $TYPE $NAME = Dart$IDL_TYPE::toNative(Dart_GetNativeArgument(args, $INDEX), exception);\n'
+        '        if (exception)\n'
+        '            goto fail;\n',
+        TYPE=type,
+        NAME=argument_name,
+        IDL_TYPE=type_info.idl_type(),
+        INDEX=index + 1)
+    return conversion % argument_name
 
   def _GenerateNativeBinding(self, idl_name, argument_count, dart_declaration,
       native_suffix, is_custom):
     native_binding = '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
     self._members_emitter.Emit(
         '\n'
         '  $DART_DECLARATION native "$NATIVE_BINDING";\n',
         DART_DECLARATION=dart_declaration, NATIVE_BINDING=native_binding)
 
     cpp_callback_name = '%s%s' % (idl_name, native_suffix)
@@ skipping 81 matching lines @@
 def _InstanceOfNode(database, interface):
   if interface.id == 'Node':
     return True
   for parent in interface.parents:
     if not database.HasInterface(parent.type.id):
       continue
     parent_interface = database.GetInterface(parent.type.id)
     if _InstanceOfNode(database, parent_interface):
       return True
   return False