Do not rename idl types to dart types at top level - this info is needed for native bindings genera…

client/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 281 matching lines @@
     parameter_definitions = ''
     if 'CallWith' in self._interface.ext_attrs:
       call_with = self._interface.ext_attrs['CallWith']
       if call_with == 'ScriptExecutionContext':
         raises_dart_exceptions = True
         parameter_definitions = (
             '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
             '        if (!context) {\n'
             '            exception = Dart_NewString("Failed to create an object");\n'
             '            goto fail;\n'
-            '        }\n')
+            '        }')
         arguments = ['context']
       else:
         raise Exception('Unsupported CallWith=%s attribute' % call_with)
 
     self._GenerateNativeCallback(
         callback_name='constructorCallback',
         idl_node=self._interface,
         parameter_definitions=parameter_definitions,
         needs_receiver=False, function_name='%s::create' % type_info.native_type(),
         arguments=arguments,
@@ skipping 82 matching lines @@
     if (self._interface.id in classes_with_unsupported_custom_getters and
         getter and set(['Custom', 'CustomGetter']) & set(getter.ext_attrs)):
       return
 
     if getter:
       self._AddGetter(getter)
     if setter:
       self._AddSetter(setter)
 
   def _AddGetter(self, attr):
-    dart_declaration = '%s get %s()' % (attr.type.id, attr.id)
+    type_info = GetIDLTypeInfo(attr.type)
+    dart_declaration = '%s get %s()' % (type_info.dart_type(), attr.id)
     is_custom = 'Custom' in attr.ext_attrs or 'CustomGetter' in attr.ext_attrs
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 1,
         dart_declaration, 'Getter', is_custom)
     if is_custom:
       return
 
     arguments = []
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = GetIDLTypeInfo(attr.type).webcore_getter_name()
       if 'URL' in attr.ext_attrs:
@@ skipping 16 matching lines @@
                                        webcore_function_name)
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
     self._GenerateNativeCallback(cpp_callback_name, attr, '',
         True, webcore_function_name, arguments, idl_return_type=attr.type,
         raises_dart_exceptions=attr.get_raises,
         raises_dom_exceptions=attr.get_raises)
 
   def _AddSetter(self, attr):
-    dart_declaration = 'void set %s(%s)' % (attr.id, attr.type.id)
+    type_info = GetIDLTypeInfo(attr.type)
+    dart_declaration = 'void set %s(%s)' % (attr.id, type_info.dart_type())
     is_custom = set(['Custom', 'CustomSetter', 'V8CustomSetter']) & set(attr.ext_attrs)
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 2,
         dart_declaration, 'Setter', is_custom)
     if is_custom:
       return
 
     arguments = []
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = GetIDLTypeInfo(attr.type).webcore_setter_name()
       arguments.append(self._GenerateWebCoreReflectionAttributeName(attr))
@@ skipping 227 matching lines @@
           '        ExceptionCode ec = 0;\n'
           '$BODY'
           '        if (UNLIKELY(ec)) {\n'
           '            exception = DartDOMWrapper::exceptionCodeToDartException(ec);\n'
           '            goto fail;\n'
           '        }\n')
 
     nested_templates.append(
         '    {\n'
         '$PARAMETER_DEFINITIONS'
+        '\n'
         '$BODY'
         '        return;\n'
         '    }\n')
 
     if raises_dart_exceptions:
       nested_templates.append(
           '    Dart_Handle exception;\n'
           '$BODY'
           '\n'
           'fail:\n'
           '    Dart_ThrowException(exception);\n'
           '    ASSERT_NOT_REACHED();\n')
 
     nested_templates.append(
         '\n'
         'static void $CALLBACK_NAME(Dart_NativeArguments args)\n'
         '{\n'
         '    DartApiScope dartApiScope;\n'
         '$BODY'
         '}\n')
 
     template_parameters = {
         'CALLBACK_NAME': callback_name,
         'WEBCORE_CLASS_NAME': self._interface_type_info.native_type(),
         'PARAMETER_DEFINITIONS': parameter_definitions,
     }
     if needs_receiver:
       template_parameters['PARAMETER_DEFINITIONS'] = emitter.Format(
           '        $WEBCORE_CLASS_NAME* receiver = DartDOMWrapper::receiver< $WEBCORE_CLASS_NAME >(args);\n'
-          '        $PARAMETER_DEFINITIONS\n',
+          '$PARAMETER_DEFINITIONS',
           **template_parameters)
 
     for template in nested_templates:
       template_parameters['BODY'] = callback
       callback = emitter.Format(template, **template_parameters)
 
     self._cpp_definitions_emitter.Emit(callback)
 
   def _GenerateParameterAdapter(self, emitter, idl_argument, index):
     type_info = GetIDLTypeInfo(idl_argument.type)
@@ skipping 40 matching lines @@
     namespace = 'HTMLNames'
     svg_exceptions = ['class', 'id', 'onabort', 'onclick', 'onerror', 'onload',
                       'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover',
                       'onmouseup', 'onresize', 'onscroll', 'onunload']
     if self._interface.id.startswith('SVG') and not attr.id in svg_exceptions:
       namespace = 'SVGNames'
     self._cpp_impl_includes[namespace] = 1
 
     attribute_name = attr.ext_attrs['Reflect'] or attr.id.lower()
     return 'WebCore::%s::%sAttr' % (namespace, attribute_name)