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 285 matching lines @@
             '        if (!context) {\n'
             '            exception = Dart_NewString("Failed to create an object");\n'
             '            goto fail;\n'
             '        }\n')
         arguments.append('context')
       else:
         raise Exception('Unsupported CallWith=%s attribute' % call_with)
 
     # Process constructor arguments.
     for (i, argument) in enumerate(constructor_info.idl_args):
-      argument_expression = self._GenerateParameterAdapter(
+      argument_expression = self._GenerateToNative(
           parameter_definitions_emitter, argument, i)
       arguments.append(argument_expression)
 
     function_expression = '%s::%s' % (self._interface_type_info.native_type(), create_function)
     invocation = self._GenerateWebCoreInvocation(function_expression, arguments,
         self._interface.id, self._interface.ext_attrs, raises_dom_exceptions)
     self._GenerateNativeCallback(callback_name='constructorCallback',
         parameter_definitions=parameter_definitions_emitter.Fragments(),
         needs_receiver=False, invocation=invocation,
         raises_exceptions=raises_exceptions)
@@ skipping 63 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 129 matching lines @@
       webcore_function_name = GetIDLTypeInfo(attr.type.id).webcore_setter_name()
       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, 1, adapter_name='value')
+    argument_expression = self._GenerateToNative(
+        parameter_definitions_emitter, attr, 1, 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 112 matching lines @@
     start_index = 1
     if operation.is_static:
       start_index = 0
     for (i, argument) in enumerate(operation.arguments):
       if (i == len(operation.arguments) - 1 and
           self._interface.id == 'Console' and
           argument.id == 'arg'):
         # FIXME: we are skipping last argument here because it was added in
         # supplemental dart.idl. Cleanup dart.idl and remove this check.
         break
-      argument_expression = self._GenerateParameterAdapter(
+      argument_expression = self._GenerateToNative(
           parameter_definitions_emitter, argument, start_index + i)
       arguments.append(argument_expression)
 
     if operation.id in ['addEventListener', 'removeEventListener']:
       # addEventListener's and removeEventListener's last argument is marked
       # as optional in idl, but is not optional in webcore implementation.
       if len(operation.arguments) == 2:
         arguments.append('false')
 
     if self._interface.id == 'CSSStyleDeclaration' and operation.id == 'setProperty':
@@ skipping 27 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):
+  def _GenerateToNative(self, emitter, idl_node, index,
+                                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
-    flags = ''
-    if (idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString' or
-        'RequiredCppParameter' in idl_node.ext_attrs):
-      flags = ', DartUtilities::ConvertNullToDefaultValue'
-    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,
-        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
+    if not IsPrimitiveType(idl_node.type.id):
+      self._cpp_impl_includes.add('"Dart%s.h"' % type_info.idl_type())
+    argument_name = argument_name or idl_node.id
+    handle = 'Dart_GetNativeArgument(args, %i)' % index
+    return type_info.emit_to_native(emitter, idl_node, argument_name, handle, self._interface.id)
 
   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 83 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