Unify processing of the cases when argument is declared optional in IDLs and is not optional in Web…

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 465 matching lines @@
 
   def dart_type(self):
     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, name, handle, interface_name):
+  def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
     if 'Callback' in idl_node.ext_attrs:
-      if set(['Optional', 'Callback']).issubset(idl_node.ext_attrs.keys()):
+      if accept_null:
         flag = 'DartUtilities::ConvertNullToDefaultValue'
       else:
         flag = 'DartUtilities::ConvertNone'
       emitter.Emit(
         '\n'
         '        RefPtr<$TYPE> $NAME = Dart$IDL_TYPE::create($HANDLE, $FLAG, exception);\n'
         '        if (exception)\n'
         '            goto fail;\n',
         TYPE=self.native_type(),
         NAME=name,
@@ skipping 90 matching lines @@
     return 'DartDOMWrapper::vectorToDart<Dart%s>(%s)' % (self._item_info.native_type(), value)
 
   def conversion_includes(self):
     return self._item_info.conversion_includes()
 
 
 class DOMStringArrayTypeInfo(SequenceIDLTypeInfo):
   def __init__(self, data, item_info):
     super(DOMStringArrayTypeInfo, self).__init__('DOMString[]', data, item_info)
 
-  def emit_to_native(self, emitter, idl_node, name, handle, interface_name):
+  def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
+    assert not accept_null
     emitter.Emit(
         '\n'
         '        RefPtr<DOMStringList> $NAME = DartDOMStringList::toNative($HANDLE, exception);\n'
         '        if (exception)\n'
         '            goto fail;\n',
         NAME=name,
         HANDLE=handle)
     return name
 
   def to_native_includes(self):
     return ['"DartDOMStringList.h"']
 
 
 class PrimitiveIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, data):
     super(PrimitiveIDLTypeInfo, self).__init__(idl_type, data)
 
-  def emit_to_native(self, emitter, idl_node, name, handle, interface_name):
+  def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
     function_name = 'dartTo%s' % self._capitalized_native_type()
-    if idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString':
+    if accept_null:
       function_name += 'WithNullCheck'
     type = self.native_type()
     if type == 'SerializedScriptValue':
       type = 'RefPtr<%s>' % type
     if type == 'String':
       type = 'DartStringAdapter'
     emitter.Emit(
         '\n'
         '        $TYPE $NAME = DartUtilities::$FUNCTION_NAME($HANDLE, exception);\n'
         '        if (exception)\n'
@@ skipping 205 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)