Do not use overloaded toDartValue for primitive types.

lib/dom/scripts/generator.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 systems to generate
 Dart APIs from the IDL database."""
 
 import re
+import string
 
 _pure_interfaces = set([
     'DOMStringList',
     'DOMStringMap',
     'ElementTimeControl',
     'ElementTraversal',
     'MediaQueryListListener',
     'NodeSelector',
     'SVGExternalResourcesRequired',
     'SVGFilterPrimitiveStandardAttributes',
@@ skipping 466 matching lines @@
     else:
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
 
   def receiver(self):
     return 'receiver->'
 
   def conversion_includes(self):
     return ['"Dart%s.h"' % include for include in self._conversion_includes]
 
-  def to_dart_conversion(self, value, interface_name, attributes):
+  def to_dart_conversion(self, value, interface_name=None, attributes=None):
     return 'toDartValue(%s)' % value
 
   def custom_to_dart(self):
     return self._custom_to_dart
 
 
 class SequenceIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, item_info):
     super(SequenceIDLTypeInfo, self).__init__(idl_type)
     self._item_info = item_info
 
   def dart_type(self):
     return 'List<%s>' % self._item_info.dart_type()
 
   def conversion_includes(self):
     return self._item_info.conversion_includes()
 
 
 class PrimitiveIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, dart_type, native_type=None, ref_counted=False,
-               needs_static_cast=False,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute'):
     super(PrimitiveIDLTypeInfo, self).__init__(idl_type, dart_type=dart_type,
         native_type=native_type, ref_counted=ref_counted)
-    self._needs_static_cast = needs_static_cast
     self._webcore_getter_name = webcore_getter_name
     self._webcore_setter_name = webcore_setter_name
 
   def parameter_adapter_info(self):
     native_type = self.native_type()
     if self._ref_counted:
       native_type = 'RefPtr< %s >' % native_type
     return ('ParameterAdapter< %s >' % native_type, None)
 
   def parameter_type(self):
     if self.native_type() == 'String':
       return 'const String&'
     return self.native_type()
 
   def conversion_includes(self):
     return []
 
-  def to_dart_conversion(self, value, interface_name, attributes):
-    if self._needs_static_cast:
-      value = 'static_cast<%s>(%s)' % (self.native_type(), value)
+  def to_dart_conversion(self, value, interface_name=None, attributes=None):
     conversion_arguments = [value]
-    if 'TreatReturnedNullStringAs' in attributes:
-        conversion_arguments.append('ConvertDefaultToNull')
-    return 'toDartValue(%s)' % ', '.join(conversion_arguments)
+    if attributes and 'TreatReturnedNullStringAs' in attributes:
+      conversion_arguments.append('DartUtilities::ConvertNullToDefaultValue')
+    function_name = 'toDartValue'
+    # FIXME: implement DartUtilities::toDart for other primitive types and
+    # remove this list.
+    if self.native_type() in ['String', 'bool', 'int', 'unsigned', 'long long', 'unsigned long long', 'double']:
+      function_name = string.capwords(self.native_type()).replace(' ', '')
+      function_name = function_name[0].lower() + function_name[1:]
+      function_name = 'DartUtilities::%sToDart' % function_name
+    return '%s(%s)' % (function_name, ', '.join(conversion_arguments))
 
   def webcore_getter_name(self):
     return self._webcore_getter_name
 
   def webcore_setter_name(self):
     return self._webcore_setter_name
 
 class SVGTearOffIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, native_type='', ref_counted=True):
     super(SVGTearOffIDLTypeInfo, self).__init__(idl_type,
@@ skipping 24 matching lines @@
     elif interface_name.endswith('List'):
       conversion_cast = 'static_cast<%s*>(%s.get())'
     elif self.idl_type() in svg_primitive_types:
       conversion_cast = '%s::create(%s)'
     else:
       conversion_cast = 'static_cast<%s*>(%s)'
     conversion_cast = conversion_cast % (self.native_type(), value)
     return 'toDartValue(%s)' %  conversion_cast
 
 _idl_type_registry = {
-    # There is GC3Dboolean which is not a bool, but unsigned char for OpenGL compatibility.
     'boolean': PrimitiveIDLTypeInfo('boolean', dart_type='bool', native_type='bool',
-                                    needs_static_cast=True,
                                     webcore_getter_name='hasAttribute',
                                     webcore_setter_name='setBooleanAttribute'),
-    # Some IDL's unsigned shorts/shorts are mapped to WebCore C++ enums, so we
-    # use a static_cast<int> here not to provide overloads for all enums.
-    'short': PrimitiveIDLTypeInfo('short', dart_type='int', native_type='int',
-        needs_static_cast=True),
+    'short': PrimitiveIDLTypeInfo('short', dart_type='int', native_type='int'),
     'unsigned short': PrimitiveIDLTypeInfo('unsigned short', dart_type='int',
-        native_type='int', needs_static_cast=True,),
+        native_type='int'),
     'int': PrimitiveIDLTypeInfo('int', dart_type='int'),
     'unsigned int': PrimitiveIDLTypeInfo('unsigned int', dart_type='int',
         native_type='unsigned'),
     'long': PrimitiveIDLTypeInfo('long', dart_type='int', native_type='int',
         webcore_getter_name='getIntegralAttribute',
         webcore_setter_name='setIntegralAttribute'),
     'unsigned long': PrimitiveIDLTypeInfo('unsigned long', dart_type='int',
         native_type='unsigned',
         webcore_getter_name='getUnsignedIntegralAttribute',
         webcore_setter_name='setUnsignedIntegralAttribute'),
     'long long': PrimitiveIDLTypeInfo('long long', dart_type='int'),
     'unsigned long long': PrimitiveIDLTypeInfo('unsigned long long', dart_type='int'),
     'float': PrimitiveIDLTypeInfo('float', dart_type='num', native_type='double'),
     'double': PrimitiveIDLTypeInfo('double', dart_type='num'),
 
     'any': PrimitiveIDLTypeInfo('any', dart_type='Object'),
     'any[]': PrimitiveIDLTypeInfo('any[]', dart_type='List'),
     'Array': PrimitiveIDLTypeInfo('Array', dart_type='List'),
     'custom': PrimitiveIDLTypeInfo('custom', dart_type='Dynamic'),
     'Date': PrimitiveIDLTypeInfo('Date', dart_type='Date', native_type='double'),
     'DOMObject': PrimitiveIDLTypeInfo('DOMObject', dart_type='Object', native_type='ScriptValue'),
     'DOMString': PrimitiveIDLTypeInfo('DOMString', dart_type='String', native_type='String'),
     # TODO(sra): Flags is really a dictionary: {create:bool, exclusive:bool}
     # http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-flags-interface
     'Flags': PrimitiveIDLTypeInfo('Flags', dart_type='Object'),
-    'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp', dart_type='int'),
+    'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp', dart_type='int', native_type='unsigned long long'),
     'object': PrimitiveIDLTypeInfo('object', dart_type='Object', native_type='ScriptValue'),
     # TODO(sra): Come up with some meaningful name so that where this appears in
     # the documentation, the user is made aware that only a limited subset of
     # serializable types are actually permitted.
     'SerializedScriptValue': PrimitiveIDLTypeInfo('SerializedScriptValue', dart_type='Dynamic', ref_counted=True),
     # TODO(sra): Flags is really a dictionary: {create:bool, exclusive:bool}
     # http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-flags-interface
     'WebKitFlags': PrimitiveIDLTypeInfo('WebKitFlags', dart_type='Object'),
 
     'DOMStringList': PrimitiveIDLTypeInfo('DOMStringList', dart_type='List<String>'),
@@ skipping 38 matching lines @@
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGTransformListPropertyTearOff.h"',
     '"SVGPathSegListPropertyTearOff.h"',
 ]
 
 def GetIDLTypeInfo(idl_type_name):
   match = re.match(r'sequence<(\w+)>$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
   return _idl_type_registry.get(idl_type_name, IDLTypeInfo(idl_type_name))