- Modify toDart to first do a simple lookup in the appropriate table before going down the templati…

tools/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 393 matching lines @@
         '    }\n',
         RETURN_TYPE=return_type,
         TO_NATIVE_BODY=to_native_body,
         TO_NATIVE_ARG_BODY=to_native_arg_body,
         INTERFACE=self._interface.id)
 
     to_dart_emitter = emitter.Emitter()
 
     ext_attrs = self._interface.ext_attrs
 
+    to_dart_emitter.Emit(
+        '    static Dart_Handle toDart(NativeType* value)\n'
+        '    {\n'
+        '        if (!value)\n'
+        '            return Dart_Null();\n'
+        '        Dart_WeakPersistentHandle result = DartDOMWrapper::lookupWrapper(isNode, value);\n'
+        '        if (result)\n'
+        '            return Dart_HandleFromWeakPersistent(result);\n'
+        '        return createWrapper(value);\n'
+        '    }\n'
+        '    static void returnToDart(Dart_NativeArguments args, NativeType* value)\n'
+        '    {\n'
+        '        if (value) {\n'
+        '            Dart_WeakPersistentHandle result = DartDOMWrapper::lookupWrapper(isNode, value);\n'
+        '            if (result)\n'
+        '                Dart_SetWeakHandleReturnValue(args, result);\n'
+        '            else\n'
+        '                Dart_SetReturnValue(args, createWrapper(value));\n'
+        '        }\n'
+        '    }\n',
+        )
+
     if ('CustomToV8' in ext_attrs or
         'PureInterface' in ext_attrs or
         'CPPPureInterface' in ext_attrs or
         self._interface_type_info.custom_to_dart()):
       to_dart_emitter.Emit(
-          '    static Dart_Handle toDart(NativeType* value);\n')
+          '    static Dart_Handle createWrapper(NativeType* value);\n')
     else:
       to_dart_emitter.Emit(
-          '    static Dart_Handle toDart(NativeType* value)\n'
+          '    static Dart_Handle createWrapper(NativeType* value)\n'
           '    {\n'
-          '        return DartDOMWrapper::toDart<Dart$(INTERFACE)>(value);\n'
+          '        return DartDOMWrapper::createWrapper<Dart$(INTERFACE)>(value);\n'
           '    }\n',
           INTERFACE=self._interface.id)
 
     webcore_includes = self._GenerateCPPIncludes(
         self._interface_type_info.webcore_includes())
 
     is_node_test = lambda interface: interface.id == 'Node'
     is_active_test = lambda interface: 'ActiveDOMObject' in interface.ext_attrs
     is_event_target_test = lambda interface: 'EventTarget' in interface.ext_attrs
+
     def TypeCheckHelper(test):
       return 'true' if any(map(test, self._database.Hierarchy(self._interface))) else 'false'
 
     self._cpp_header_emitter.Emit(
         self._template_loader.Load('cpp_header.template'),
         INTERFACE=self._interface.id,
         WEBCORE_INCLUDES=webcore_includes,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type(),
         WEBCORE_CLASS_NAME_ESCAPED=
         self._interface_type_info.native_type().replace('<', '_').replace('>', '_'),
@@ skipping 554 matching lines @@
         else:
           assert (return_type_info.native_type() == 'int' or return_type_info.native_type() == 'long long')
           set_return_value = 'DartUtilities::setDartIntegerReturnValue(args, %s)' % (value_expression)
       elif return_type_info.dart_type() == 'double':
         set_return_value = 'Dart_SetDoubleReturnValue(args, %s)' % (value_expression)
       elif return_type_info.dart_type() == 'String':
         if ext_attrs and 'TreatReturnedNullStringAs' in ext_attrs:
           set_return_value = 'DartUtilities::setDartStringReturnValueWithNullCheck(args, %s)' % (value_expression)
         else:
           set_return_value = 'DartUtilities::setDartStringReturnValue(args, %s)' % (value_expression)
+      elif return_type_info.dart_type() == 'num' and return_type_info.native_type() == 'double':
+        set_return_value = 'Dart_SetDoubleReturnValue(args, %s)' % (value_expression)
       else:
-        to_dart_conversion = return_type_info.to_dart_conversion(value_expression, self._interface.id, ext_attrs)
-        set_return_value = 'Dart_SetReturnValue(args, %s)' % (to_dart_conversion)
+        return_to_dart_conversion = return_type_info.return_to_dart_conversion(value_expression, self._interface.id, ext_attrs)
+        set_return_value = '%s' % (return_to_dart_conversion)
       invocation_emitter.Emit(
         '        $RETURN_VALUE;\n',
         RETURN_VALUE=set_return_value)
 
   def _GenerateNativeBinding(self, idl_name, argument_count, dart_declaration,
       native_suffix, is_custom, emit_metadata=True):
     metadata = []
     if emit_metadata:
       metadata = self._metadata.GetFormattedMetadata(
           self._renamer.GetLibraryName(self._interface),
@@ skipping 117 matching lines @@
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')