Get rid of GetIDLTypeInfoByName.

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 55 matching lines @@
       if operation.type.id == 'void':
         return_type = 'void'
         return_prefix = ''
       else:
         return_type = 'bool'
         return_prefix = 'return '
 
       parameters = []
       arguments = []
       for argument in operation.arguments:
-        argument_type_info = GetIDLTypeInfo(argument.type)
+        argument_type_info = GetIDLTypeInfo(argument.type.id)
         parameters.append('%s %s' % (argument_type_info.parameter_type(),
                                      argument.id))
         arguments.append(argument.id)
 
       cpp_header_handlers_emitter.Emit(
           '\n'
           '    virtual $TYPE handleEvent($PARAMETERS);\n',
           TYPE=return_type, PARAMETERS=', '.join(parameters))
 
       cpp_impl_handlers_emitter.Emit(
@@ skipping 151 matching lines @@
     self._super_interface = super_interface
     self._dart_impl_emitter = dart_impl_emitter
     self._cpp_header_emitter = cpp_header_emitter
     self._cpp_impl_emitter = cpp_impl_emitter
     self._base_members = base_members
     self._templates = templates
     self._current_secondary_parent = None
 
   def StartInterface(self):
     self._class_name = self._ImplClassName(self._interface.id)
-    self._interface_type_info = GetIDLTypeInfoByName(self._interface.id)
+    self._interface_type_info = GetIDLTypeInfo(self._interface.id)
     self._members_emitter = emitter.Emitter()
     self._cpp_declarations_emitter = emitter.Emitter()
     self._cpp_impl_includes = {}
     self._cpp_definitions_emitter = emitter.Emitter()
     self._cpp_resolver_emitter = emitter.Emitter()
 
     self._GenerateConstructors()
 
   def _GenerateConstructors(self):
     if not self._IsConstructable():
@@ skipping 45 matching lines @@
       else:
         raise Exception('Unsupported CallWith=%s attribute' % call_with)
 
     # Process constructor arguments.
     for (i, arg) in enumerate(constructor_info.idl_args):
       self._GenerateParameterAdapter(parameter_definitions_emitter, arg, i - 1)
       arguments.append(arg.id)
 
     function_expression = '%s::%s' % (self._interface_type_info.native_type(), create_function)
     invocation = self._GenerateWebCoreInvocation(function_expression, arguments,
-        self._interface, self._interface.ext_attrs, raises_dom_exceptions)
+        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_dart_exceptions)
 
   def _ImplClassName(self, interface_name):
     return interface_name + 'Implementation'
 
   def _IsConstructable(self):
     # FIXME: support ConstructorTemplate.
@@ skipping 72 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):
-    type_info = GetIDLTypeInfo(attr.type)
+    type_info = GetIDLTypeInfo(attr.type.id)
     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()
+      webcore_function_name = GetIDLTypeInfo(attr.type.id).webcore_getter_name()
       if 'URL' in attr.ext_attrs:
         if 'NonEmpty' in attr.ext_attrs:
           webcore_function_name = 'getNonEmptyURLAttribute'
         else:
           webcore_function_name = 'getURLAttribute'
       arguments.append(self._GenerateWebCoreReflectionAttributeName(attr))
     else:
       if attr.id == 'operator':
         webcore_function_name = '_operator'
       elif attr.id == 'target' and attr.type.id == 'SVGAnimatedString':
         webcore_function_name = 'svgTarget'
       else:
         webcore_function_name = re.sub(r'^(HTML|URL|JS|XML|XSLT|\w)',
                                        lambda s: s.group(1).lower(),
                                        attr.id)
         webcore_function_name = re.sub(r'^(create|exclusive)',
                                        lambda s: 'is' + s.group(1).capitalize(),
                                        webcore_function_name)
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     invocation = self._GenerateWebCoreInvocation(function_expression,
-        arguments, attr.type, attr.ext_attrs, attr.get_raises)
+        arguments, attr.type.id, attr.ext_attrs, attr.get_raises)
     self._GenerateNativeCallback(cpp_callback_name, '', True, invocation,
         raises_exceptions=attr.get_raises)
 
   def _AddSetter(self, attr):
-    type_info = GetIDLTypeInfo(attr.type)
+    type_info = GetIDLTypeInfo(attr.type.id)
     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()
+      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'
 
     arguments.append(attr.id)
 
     parameter_definitions_emitter = emitter.Emitter()
     self._GenerateParameterAdapter(parameter_definitions_emitter, attr, 0)
     parameter_definitions = parameter_definitions_emitter.Fragments()
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     invocation = self._GenerateWebCoreInvocation(function_expression,
-        arguments, None, attr.ext_attrs, attr.set_raises)
+        arguments, 'void', attr.ext_attrs, attr.set_raises)
 
     self._GenerateNativeCallback(cpp_callback_name, parameter_definitions,
         True, invocation, raises_exceptions=True)
 
   def _HasNativeIndexGetter(self, interface):
     return ('CustomIndexedGetter' in interface.ext_attrs or
             'NumericIndexedGetter' in interface.ext_attrs)
 
   def _EmitNativeIndexGetter(self, interface, element_type):
     dart_declaration = '%s operator[](int index)' % element_type
@@ skipping 134 matching lines @@
       # CSSStyleDeclaration.setProperty priority parameter is optional in Dart
       # idl, but is not optional in webcore implementation.
       if len(operation.arguments) == 2:
         arguments.append('String()')
 
     if 'NeedsUserGestureCheck' in operation.ext_attrs:
       arguments.append('DartUtilities::processingUserGesture')
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, operation)
     invocation = self._GenerateWebCoreInvocation(function_expression, arguments,
-        operation.type, operation.ext_attrs, operation.raises)
+        operation.type.id, operation.ext_attrs, operation.raises)
     self._GenerateNativeCallback(cpp_callback_name,
         parameter_definitions=parameter_definitions_emitter.Fragments(),
         needs_receiver=True, invocation=invocation,
         raises_exceptions=raises_dart_exceptions)
 
   def _GenerateNativeCallback(self, callback_name, parameter_definitions,
       needs_receiver, invocation, raises_exceptions):
 
     if needs_receiver:
       parameter_definitions = emitter.Format(
@@ skipping 25 matching lines @@
         '\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_argument, index):
-    type_info = GetIDLTypeInfo(idl_argument.type)
+    type_info = GetIDLTypeInfo(idl_argument.type.id)
     (adapter_type, include_name) = type_info.parameter_adapter_info()
     if include_name:
       self._cpp_impl_includes[include_name] = 1
     flags = ''
     if (idl_argument.ext_attrs.get('Optional') == 'DefaultIsNullString' or
         ('Optional' in idl_argument.ext_attrs and 'Callback' in idl_argument.ext_attrs)):
       flags = ', DartUtilities::ConvertNullToDefaultValue'
     emitter.Emit(
         '\n'
         '        const $ADAPTER_TYPE $NAME(Dart_GetNativeArgument(args, $INDEX)$FLAGS);\n'
@@ skipping 44 matching lines @@
     return 'WebCore::%s::%sAttr' % (namespace, attribute_name)
 
   def _GenerateWebCoreFunctionExpression(self, function_name, idl_node):
     if 'ImplementedBy' in idl_node.ext_attrs:
       return '%s::%s' % (idl_node.ext_attrs['ImplementedBy'], function_name)
     return '%s%s' % (self._interface_type_info.receiver(), function_name)
 
   def _GenerateWebCoreInvocation(self, function_expression, arguments,
       idl_return_type, attributes, raises_dom_exceptions):
     invocation_template = '        $FUNCTION_CALL;\n'
-    if idl_return_type and idl_return_type.id != 'void':
+    if idl_return_type != 'void':
       return_type_info = GetIDLTypeInfo(idl_return_type)
       if return_type_info.conversion_include():
         self._cpp_impl_includes[return_type_info.conversion_include()] = 1
 
       # Generate C++ cast based on idl return type.
       conversion_cast = return_type_info.conversion_cast('$FUNCTION_CALL')
       if isinstance(return_type_info, SVGTearOffIDLTypeInfo):
         svg_primitive_types = ['SVGAngle', 'SVGLength', 'SVGMatrix',
             'SVGNumber', 'SVGPoint', 'SVGRect', 'SVGTransform']
         conversion_cast = '%s::create($FUNCTION_CALL)'
@@ skipping 32 matching lines @@
           '            goto fail;\n'
           '        }\n',
           INVOCATION=invocation_template)
 
     if 'ImplementedBy' in attributes:
       arguments.insert(0, 'receiver')
       self._cpp_impl_includes[attributes['ImplementedBy']] = 1
 
     return emitter.Format(invocation_template,
         FUNCTION_CALL='%s(%s)' % (function_expression, ', '.join(arguments)))