Unify null treatment.

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 copy
 import re
@@ skipping 467 matching lines @@
     return self._data.dart_type or self._idl_type
 
   def native_type(self):
     return self._data.native_type or self._idl_type
 
   def requires_v8_scope(self):
     return self._data.requires_v8_scope
 
   def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
     if 'Callback' in idl_node.ext_attrs:
+      function_name = 'create'
       if accept_null:
-        flag = 'DartUtilities::ConvertNullToDefaultValue'
-      else:
-        flag = 'DartUtilities::ConvertNone'
+        function_name += 'WithNullCheck'
       emitter.Emit(
         '\n'
-        '        RefPtr<$TYPE> $NAME = Dart$IDL_TYPE::create($HANDLE, $FLAG, exception);\n'
+        '        RefPtr<$TYPE> $NAME = Dart$IDL_TYPE::$FUNCTION_NAME($HANDLE, exception);\n'
         '        if (exception)\n'
         '            goto fail;\n',
         TYPE=self.native_type(),
         NAME=name,
+        FUNCTION_NAME=function_name,
         IDL_TYPE=self.idl_type(),
-        HANDLE=handle,
-        FLAG=flag)
+        HANDLE=handle)
       return name
 
     argument = name
     if self.custom_to_native():
       type = 'RefPtr<%s>' % self.native_type()
       argument = '%s.get()' % name
     else:
       type = '%s*' % self.native_type()
       if isinstance(self, SVGTearOffIDLTypeInfo) and not interface_name.endswith('List'):
         argument = '%s->propertyReference()' % name
@@ skipping 128 matching lines @@
       return 'const String&'
     return self.native_type()
 
   def conversion_includes(self):
     return []
 
   def to_native_includes(sefl):
     return []
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
-    conversion_arguments = [value]
-    if attributes and 'TreatReturnedNullStringAs' in attributes:
-      conversion_arguments.append('DartUtilities::ConvertNullToDefaultValue')
     function_name = self._capitalized_native_type()
     function_name = function_name[0].lower() + function_name[1:]
     function_name = 'DartUtilities::%sToDart' % function_name
-    return '%s(%s)' % (function_name, ', '.join(conversion_arguments))
+    if attributes and 'TreatReturnedNullStringAs' in attributes:
+      function_name += 'WithNullCheck'
+    return '%s(%s)' % (function_name, value)
 
   def webcore_getter_name(self):
     return self._data.webcore_getter_name
 
   def webcore_setter_name(self):
     return self._data.webcore_setter_name
 
   def _capitalized_native_type(self):
     return re.sub(r'(^| )([a-z])', lambda x: x.group(2).upper(), self.native_type())
 
@@ skipping 169 matching lines @@
     if match:
       if type_name == 'DOMString[]':
         return DOMStringArrayTypeInfo(TypeData('Sequence'), self.TypeInfo('DOMString'))
       item_info = self.TypeInfo(match.group(1) or match.group(2))
       return SequenceIDLTypeInfo(type_name, TypeData('Sequence'), item_info)
     if not type_name in _idl_type_registry:
       return InterfaceIDLTypeInfo(type_name, TypeData('Interface'))
     type_data = _idl_type_registry.get(type_name)
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)