Cleanup ParameterAdapter for bindings classes.

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
 
@@ skipping 406 matching lines @@
 # Given a sorted sequence of type identifiers, return an appropriate type
 # name
 def TypeName(type_ids, interface):
   # Dynamically type this field for now.
   return 'Dynamic'
 
 # ------------------------------------------------------------------------------
 
 class IDLTypeInfo(object):
   def __init__(self, idl_type, dart_type=None,
-               native_type=None, ref_counted=True,
+               native_type=None,
                custom_to_native=False,
                custom_to_dart=False, conversion_includes=[]):
     self._idl_type = idl_type
     self._dart_type = dart_type
     self._native_type = native_type
-    self._ref_counted = ref_counted
     self._custom_to_native = custom_to_native
     self._custom_to_dart = custom_to_dart
     self._conversion_includes = conversion_includes + [idl_type]
 
   def idl_type(self):
     return self._idl_type
 
   def dart_type(self):
     return self._dart_type or self._idl_type
 
   def native_type(self):
     return self._native_type or self._idl_type
 
   def parameter_adapter_info(self):
-    native_type = self.native_type()
-    if self._ref_counted:
-      native_type = 'RefPtr< %s >' % native_type
-    wrapper_type = 'Dart%s' % self.idl_type()
-    adapter_type = 'ParameterAdapter<%s, %s>' % (native_type, wrapper_type)
-    return (adapter_type, '"%s.h"' % wrapper_type)
+    adapter_type = 'ParameterAdapter<Dart%s>' % self._idl_type
+    include = '"Dart%s.h"' % self._idl_type
+    return (adapter_type, include)
 
   def custom_to_native(self):
     return self._custom_to_native
 
   def parameter_type(self):
     return '%s*' % self.native_type()
 
   def webcore_includes(self):
     WTF_INCLUDES = [
         'ArrayBuffer',
         'ArrayBufferView',
         'Float32Array',
         'Float64Array',
         'Int8Array',
         'Int16Array',
         'Int32Array',
         'Uint8Array',
         'Uint16Array',
         'Uint32Array',
         'Uint8ClampedArray',
     ]
 
     if self._idl_type in WTF_INCLUDES:
       return ['<wtf/%s.h>' % self.native_type()]
 
     if not self._idl_type.startswith('SVG'):
       return ['"%s.h"' % self.native_type()]
 
     if self._idl_type in ['SVGNumber', 'SVGPoint']:
-      return []
+      return ['"SVGPropertyTearOff.h"']
     if self._idl_type.startswith('SVGPathSeg'):
       include = self._idl_type.replace('Abs', '').replace('Rel', '')
     else:
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
 
   def receiver(self):
     return 'receiver->'
 
   def conversion_includes(self):
@@ skipping 15 matching lines @@
     return 'List<%s>' % self._item_info.dart_type()
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     return 'DartDOMWrapper::vectorToDart<Dart%s>(%s)' % (self._item_info.native_type(), value)
 
   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,
+  def __init__(self, idl_type, dart_type, native_type=None,
                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)
+        native_type=native_type)
     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)
+    adapter_type = 'ParameterAdapter<%s>' % self.native_type()
+    return (adapter_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=None, attributes=None):
     conversion_arguments = [value]
     if attributes and 'TreatReturnedNullStringAs' in attributes:
       conversion_arguments.append('DartUtilities::ConvertNullToDefaultValue')
     function_name = re.sub(r' [a-z]', lambda x: x.group(0)[1:].upper(), self.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))
 
   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):
+  def __init__(self, idl_type, native_type=''):
     super(SVGTearOffIDLTypeInfo, self).__init__(idl_type,
-                                                native_type=native_type,
-                                                ref_counted=ref_counted)
+                                                native_type=native_type)
 
   def native_type(self):
     if self._native_type:
       return self._native_type
     tear_off_type = 'SVGPropertyTearOff'
     if self._idl_type.endswith('List'):
       tear_off_type = 'SVGListPropertyTearOff'
     return '%s<%s>' % (tear_off_type, self._idl_type)
 
   def receiver(self):
@@ skipping 51 matching lines @@
     # a native JS Map for JS DOM.
     'Dictionary': PrimitiveIDLTypeInfo('Dictionary', dart_type='Map'),
     # 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', 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),
+    'SerializedScriptValue': PrimitiveIDLTypeInfo('SerializedScriptValue', dart_type='Dynamic'),
     # 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'),
 
     'sequence': PrimitiveIDLTypeInfo('sequence', dart_type='List'),
     'void': PrimitiveIDLTypeInfo('void', dart_type='void'),
 
     'CSSRule': IDLTypeInfo('CSSRule', conversion_includes=['CSSImportRule']),
     'DOMException': IDLTypeInfo('DOMException', native_type='DOMCoreException'),
     'DOMStringList': IDLTypeInfo('DOMStringList', dart_type='List<String>', custom_to_native=True),
     'DOMStringMap': IDLTypeInfo('DOMStringMap', dart_type='Map<String, String>'),
     'DOMWindow': IDLTypeInfo('DOMWindow', custom_to_dart=True),
     'Element': IDLTypeInfo('Element', custom_to_dart=True),
     'EventListener': IDLTypeInfo('EventListener', custom_to_native=True),
     'EventTarget': IDLTypeInfo('EventTarget', custom_to_native=True),
     'HTMLElement': IDLTypeInfo('HTMLElement', custom_to_dart=True),
     'IDBAny': IDLTypeInfo('IDBAny', dart_type='Dynamic', custom_to_native=True),
     'IDBKey': IDLTypeInfo('IDBKey', dart_type='Dynamic', custom_to_native=True),
     'MediaQueryListListener': IDLTypeInfo('MediaQueryListListener', custom_to_native=True),
     'StyleSheet': IDLTypeInfo('StyleSheet', conversion_includes=['CSSStyleSheet']),
     'SVGElement': IDLTypeInfo('SVGElement', custom_to_dart=True),
 
     'SVGAngle': SVGTearOffIDLTypeInfo('SVGAngle'),
     'SVGLength': SVGTearOffIDLTypeInfo('SVGLength'),
-    'SVGLengthList': SVGTearOffIDLTypeInfo('SVGLengthList', ref_counted=False),
+    'SVGLengthList': SVGTearOffIDLTypeInfo('SVGLengthList'),
     'SVGMatrix': SVGTearOffIDLTypeInfo('SVGMatrix'),
     'SVGNumber': SVGTearOffIDLTypeInfo('SVGNumber', native_type='SVGPropertyTearOff<float>'),
-    'SVGNumberList': SVGTearOffIDLTypeInfo('SVGNumberList', ref_counted=False),
-    'SVGPathSegList': SVGTearOffIDLTypeInfo('SVGPathSegList', native_type='SVGPathSegListPropertyTearOff', ref_counted=False),
+    'SVGNumberList': SVGTearOffIDLTypeInfo('SVGNumberList'),
+    'SVGPathSegList': SVGTearOffIDLTypeInfo('SVGPathSegList', native_type='SVGPathSegListPropertyTearOff'),
     'SVGPoint': SVGTearOffIDLTypeInfo('SVGPoint', native_type='SVGPropertyTearOff<FloatPoint>'),
-    'SVGPointList': SVGTearOffIDLTypeInfo('SVGPointList', ref_counted=False),
+    'SVGPointList': SVGTearOffIDLTypeInfo('SVGPointList'),
     'SVGPreserveAspectRatio': SVGTearOffIDLTypeInfo('SVGPreserveAspectRatio'),
     'SVGRect': SVGTearOffIDLTypeInfo('SVGRect', native_type='SVGPropertyTearOff<FloatRect>'),
-    'SVGStringList': SVGTearOffIDLTypeInfo('SVGStringList', native_type='SVGStaticListPropertyTearOff<SVGStringList>', ref_counted=False),
+    'SVGStringList': SVGTearOffIDLTypeInfo('SVGStringList', native_type='SVGStaticListPropertyTearOff<SVGStringList>'),
     'SVGTransform': SVGTearOffIDLTypeInfo('SVGTransform'),
-    'SVGTransformList': SVGTearOffIDLTypeInfo('SVGTransformList', native_type='SVGTransformListPropertyTearOff', ref_counted=False)
+    'SVGTransformList': SVGTearOffIDLTypeInfo('SVGTransformList', native_type='SVGTransformListPropertyTearOff')
 }
 
 _svg_supplemental_includes = [
     '"SVGAnimatedPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGStaticListPropertyTearOff.h"',
     '"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))