Changed to use JSInterop

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 648 matching lines @@
         CPP_CALLBACK=constructor_callback_cpp_name)
 
   def GenerateCustomFactory(self, constructor_info):
     if 'CustomConstructor' not in self._interface.ext_attrs:
         return False
 
     annotations = self._metadata.GetFormattedMetadata(self._library_name,
         self._interface, self._interface.id, '  ')
 
     self._members_emitter.Emit(
-        '\n  $(ANNOTATIONS)factory $CTOR($PARAMS) => _create($FACTORY_PARAMS);\n',
+        '\n  $(ANNOTATIONS)factory $CTOR($PARAMS) => wrap_jso(_create($FACTORY_PARAMS));\n',
         ANNOTATIONS=annotations,
         CTOR=constructor_info._ConstructorFullName(self._DartType),
         PARAMS=constructor_info.ParametersAsDeclaration(self._DartType),
         FACTORY_PARAMS= \
             constructor_info.ParametersAsArgumentList())
 
-    constructor_callback_cpp_name = 'constructorCallback'
-    self._EmitConstructorInfrastructure(
-        constructor_info, "", constructor_callback_cpp_name, '_create',
-        is_custom=True)
+    # MutationObserver has custom _create.  TODO(terry): Consider table but this is only one.
+    if self._interface.id != 'MutationObserver':
+        constructor_callback_cpp_name = 'constructorCallback'
+        self._EmitConstructorInfrastructure(
+            constructor_info, "", constructor_callback_cpp_name, '_create',
+            is_custom=True)
 
-    self._cpp_declarations_emitter.Emit(
-        '\n'
-        'void $CPP_CALLBACK(Dart_NativeArguments);\n',
-        CPP_CALLBACK=constructor_callback_cpp_name)
+        self._cpp_declarations_emitter.Emit(
+            '\n'
+            'void $CPP_CALLBACK(Dart_NativeArguments);\n',
+            CPP_CALLBACK=constructor_callback_cpp_name)
 
     return True
 
   def IsConstructorArgumentOptional(self, argument):
     return IsOptional(argument)
 
   def EmitStaticFactoryOverload(self, constructor_info, name, arguments):
     constructor_callback_cpp_name = name + 'constructorCallback'
     self._EmitConstructorInfrastructure(
         constructor_info, name, 'constructorCallback', name, arguments,
@@ skipping 214 matching lines @@
     # Temporary hack to force dart:scalarlist clamped array for ImageData.data.
     # TODO(antonm): solve in principled way.
     if self._interface.id == 'ImageData' and html_name == 'data':
       html_name = '_data'
     type_info = self._TypeInfo(attr.type.id)
     return_type = self.SecureOutputType(attr.type.id, False, read_only)
     parameters = []
     dart_declaration = '%s get %s' % (return_type, html_name)
     is_custom = _IsCustom(attr) and (_IsCustomValue(attr, None) or
                                      _IsCustomValue(attr, 'Getter'))
+
+    # Operation uses blink?
+    wrap_unwrap_list = [];
+    return_wrap_jso = False
+    if self._dart_use_blink:
+        # Unwrap the type to get the JsObject if Type is:
+        #
+        #    - known IDL type
+        #    - type_id is None then it's probably a union type or overloaded
+        #      it's a dynamic/any type
+        #    - type is Object
+        #
+        # JsObject maybe stored in the Dart class.
+        return_wrap_jso = (isinstance(type_info, InterfaceIDLTypeInfo) or
+                           not(type_info) or attr.type.id == 'Object')
+    wrap_unwrap_list.append(return_wrap_jso)       # wrap_jso the returned object
+    wrap_unwrap_list.append(self._dart_use_blink)  # this must be unwrap_jso
+
     # This seems to have been replaced with Custom=Getter (see above), but
     # check to be sure we don't see the old syntax
     assert(not ('CustomGetter' in attr.ext_attrs))
     native_suffix = 'Getter'
     auto_scope_setup = self._GenerateAutoSetupScope(attr.id, native_suffix)
     native_entry = \
         self.DeriveNativeEntry(attr.id, 'Getter', None)
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 1,
         dart_declaration, attr.is_static, return_type, parameters,
-        native_suffix, is_custom, auto_scope_setup, native_entry=native_entry)
+        native_suffix, is_custom, auto_scope_setup, native_entry=native_entry,
+        wrap_unwrap_list=wrap_unwrap_list)
     if is_custom:
       return
 
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = self._TypeInfo(attr.type.id).webcore_getter_name()
       if 'URL' in attr.ext_attrs:
         if 'NonEmpty' in attr.ext_attrs:
           webcore_function_name = 'getNonEmptyURLAttribute'
         else:
           webcore_function_name = 'getURLAttribute'
@@ skipping 17 matching lines @@
         True,
         function_expression,
         attr,
         [],
         attr.type.id,
         attr.type.nullable,
         raises,
         auto_scope_setup)
 
   def _AddSetter(self, attr, html_name):
+    return_type = 'void'
+    ptype = self._DartType(attr.type.id)
+
     type_info = self._TypeInfo(attr.type.id)
-    return_type = 'void'
-    parameters = ['value']
-    ptype = self._DartType(attr.type.id)
+
+    # Is the setter value a DartClass (that has a JsObject) or the type is
+    # None (it's a dynamic/any type) then unwrap_jso before passing to blink.
+    parameters = ['unwrap_jso(value)' if (isinstance(type_info, InterfaceIDLTypeInfo) or
+                                          not(attr.type.id) or ptype == 'Object')
+                  else 'value']
+
     dart_declaration = 'void set %s(%s value)' % (html_name, ptype)
     is_custom = _IsCustom(attr) and (_IsCustomValue(attr, None) or
                                      _IsCustomValue(attr, 'Setter'))
     # This seems to have been replaced with Custom=Setter (see above), but
     # check to be sure we don't see the old syntax
     assert(not ('CustomSetter' in attr.ext_attrs))
     assert(not ('V8CustomSetter' in attr.ext_attrs))
     native_suffix = 'Setter'
     auto_scope_setup = self._GenerateAutoSetupScope(attr.id, native_suffix)
     native_entry = \
         self.DeriveNativeEntry(attr.id, 'Setter', None)
+
+    # setters return no object and if blink this must be unwrapped.?
+    wrap_unwrap_list = [False, self._dart_use_blink];
+
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 2,
         dart_declaration, attr.is_static, return_type, parameters,
-        native_suffix, is_custom, auto_scope_setup, native_entry=native_entry)
+        native_suffix, is_custom, auto_scope_setup, native_entry=native_entry,
+        wrap_unwrap_list=wrap_unwrap_list)
     if is_custom:
       return
 
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = self._TypeInfo(attr.type.id).webcore_setter_name()
     else:
       if 'ImplementedAs' in attr.ext_attrs:
         attr_name = attr.ext_attrs['ImplementedAs']
       else:
         attr_name = attr.id
@@ skipping 46 matching lines @@
       # First emit a toplevel function to do the native call
       # Calls to this are emitted elsewhere,
       dart_native_name, resolver_string = \
           self.DeriveNativeEntry("item", 'Method', 1)
 
       # Emit the method which calls the toplevel function, along with
       # the [] operator.
       dart_qualified_name = \
           self.DeriveQualifiedBlinkName(self._interface.id,
                                         dart_native_name)
-      self._members_emitter.Emit(
-          '\n'
-          '  $TYPE operator[](int index) {\n'
-          '    if (index < 0 || index >= length)\n'
-          '      throw new RangeError.index(index, this);\n'
-          '    return $(DART_NATIVE_NAME)(this, index);\n'
-          '  }\n\n'
-          '  $TYPE _nativeIndexedGetter(int index) =>'
-          ' $(DART_NATIVE_NAME)(this, index);\n',
-          DART_NATIVE_NAME=dart_qualified_name,
-          TYPE=self.SecureOutputType(element_type),
-          INTERFACE=self._interface.id)
+
+      type_info = self._TypeInfo(element_type)
+      # Does nativeIndexGetter return a DartClass (JsObject) if so wrap_jso.
+      wrap_jso_start = ''
+      wrap_jso_end = ''
+      if isinstance(type_info, InterfaceIDLTypeInfo):
+          wrap_jso_start = 'wrap_jso('
+          wrap_jso_end = ')'
+      blinkNativeIndexed = """
+  $TYPE operator[](int index) {
+    if (index < 0 || index >= length)
+      throw new RangeError.index(index, this);
+    return %s$(DART_NATIVE_NAME)(unwrap_jso(this), index)%s;
+  }
+
+  $TYPE _nativeIndexedGetter(int index) => %s$(DART_NATIVE_NAME)(unwrap_jso(this), index)%s;
+ """ % (wrap_jso_start, wrap_jso_end, wrap_jso_start, wrap_jso_end)
+      # Wrap the type to store the JsObject if Type is:
+      #
+      #    - known IDL type
+      #    - type_id is None then it's probably a union type or overloaded
+      #      it's a dynamic/any type
+      #    - type is Object
+      #
+      # JsObject maybe stored in the Dart class.
+      if isinstance(type_info, InterfaceIDLTypeInfo) or not(type_info) or dart_element_type == 'Object':
+          blinkNativeIndexedGetter = \
+              ' {0}$(DART_NATIVE_NAME)(unwrap_jso(this), index){1};\n'.format('wrap_jso(', ')')
+      else:
+          blinkNativeIndexedGetter = \
+              ' $(DART_NATIVE_NAME)(unwrap_jso(this), index);\n'
+      self._members_emitter.Emit(blinkNativeIndexed,
+                                 DART_NATIVE_NAME=dart_qualified_name,
+                                 TYPE=self.SecureOutputType(element_type),
+                                 INTERFACE=self._interface.id)
 
     if self._HasNativeIndexSetter():
       self._EmitNativeIndexSetter(dart_element_type)
     else:
       self._members_emitter.Emit(
           '\n'
           '  void operator[]=(int index, $TYPE value) {\n'
           '    throw new UnsupportedError("Cannot assign element of immutable List.");\n'
           '  }\n',
           TYPE=dart_element_type)
@@ skipping 54 matching lines @@
     self._GenerateNativeBinding('numericIndexSetter', 3,
       dart_declaration, False, return_type, parameters,
       'Callback', True, False)
 
   def EmitOperation(self, info, html_name):
     """
     Arguments:
       info: An OperationInfo object.
     """
     return_type = self.SecureOutputType(info.type_name, False, True)
+
     formals = info.ParametersAsDeclaration(self._DartType)
-    parameters = info.ParametersAsListOfVariables()
+
+    parameters = info.ParametersAsListOfVariables(None, self._type_registry if self._dart_use_blink else None)
     dart_declaration = '%s%s %s(%s)' % (
         'static ' if info.IsStatic() else '',
         return_type,
         html_name,
         formals)
 
     operation = info.operations[0]
+
     is_custom = _IsCustom(operation)
     has_optional_arguments = any(IsOptional(argument) for argument in operation.arguments)
     needs_dispatcher = not is_custom and (len(info.operations) > 1 or has_optional_arguments)
 
+    # Operation uses blink?
+    wrap_unwrap_list = [];
+    return_wrap_jso = False
+    # return type wrapped?
+    if self._dart_use_blink:
+        # Wrap the type to store the JsObject if Type is:
+        #
+        #    - known IDL type
+        #    - type_id is None then it's probably a union type or overloaded
+        #      it's a dynamic/any type
+        #    - type is Object
+        #
+        # JsObject maybe stored in the Dart class.
+        return_wrap_jso = (info.wrap_unwrap_type_blink(return_type, self._type_registry) or
+                           return_type == 'Rectangle' or
+                           info.wrap_unwrap_list_blink(return_type, self._type_registry))
+    wrap_unwrap_list.append(return_wrap_jso)       # wrap_jso the returned object
+    wrap_unwrap_list.append(self._dart_use_blink)  # The 'this' parameter must be unwrap_jso
+
     if info.callback_args:
       self._AddFutureifiedOperation(info, html_name)
     elif not needs_dispatcher:
       # Bind directly to native implementation
       argument_count = (0 if info.IsStatic() else 1) + len(info.param_infos)
       native_suffix = 'Callback'
       auto_scope_setup = self._GenerateAutoSetupScope(info.name, native_suffix)
       native_entry = \
           self.DeriveNativeEntry(operation.id, 'Method', len(info.param_infos))
       cpp_callback_name = self._GenerateNativeBinding(
         info.name, argument_count, dart_declaration,
         info.IsStatic(), return_type, parameters,
         native_suffix, is_custom, auto_scope_setup,
-        native_entry=native_entry)
+        native_entry=native_entry,
+        wrap_unwrap_list=wrap_unwrap_list)
       if not is_custom:
         self._GenerateOperationNativeCallback(operation, operation.arguments, cpp_callback_name, auto_scope_setup)
     else:
       self._GenerateDispatcher(info, info.operations, dart_declaration, html_name)
 
   def _GenerateDispatcher(self, info, operations, dart_declaration, html_name):
 
     def GenerateCall(
         stmts_emitter, call_emitter, version, operation, argument_count):
       native_suffix = 'Callback'
-      actuals = info.ParametersAsListOfVariables(argument_count)
+      actuals = info.ParametersAsListOfVariables(argument_count, self._type_registry if self._dart_use_blink else None)
       actuals_s = ", ".join(actuals)
       formals=actuals
       return_type = self.SecureOutputType(operation.type.id)
+
+      return_wrap_jso = False
+      if self._dart_use_blink:
+         return_wrap_jso = self._type_registry.HasInterface(return_type)
+
       native_suffix = 'Callback'
       is_custom = _IsCustom(operation)
       base_name = '_%s_%s' % (operation.id, version)
       static = True
       if not operation.is_static:
-        actuals = ['this'] + actuals
+        actuals = ['unwrap_jso(this)' if self._dart_use_blink else 'this'] + actuals
         formals = ['mthis'] + formals
       actuals_s = ", ".join(actuals)
       formals_s = ", ".join(formals)
       dart_declaration = '%s(%s)' % (
         base_name, formals_s)
       native_entry = \
           self.DeriveNativeEntry(operation.id, 'Method', argument_count)
       overload_base_name = native_entry[0]
       overload_name = \
           self.DeriveQualifiedBlinkName(self._interface.id,
                                         overload_base_name)
-      call_emitter.Emit('$NAME($ARGS)', NAME=overload_name, ARGS=actuals_s)
+      if return_wrap_jso:
+          call_emitter.Emit('wrap_jso($NAME($ARGS))', NAME=overload_name, ARGS=actuals_s)
+      else:
+          call_emitter.Emit('$NAME($ARGS)', NAME=overload_name, ARGS=actuals_s)
       auto_scope_setup = \
         self._GenerateAutoSetupScope(base_name, native_suffix)
       cpp_callback_name = self._GenerateNativeBinding(
         base_name, (0 if static else 1) + argument_count,
         dart_declaration, static, return_type, formals,
         native_suffix, is_custom, auto_scope_setup, emit_metadata=False,
         emit_to_native=True, native_entry=native_entry)
       if not is_custom:
         self._GenerateOperationNativeCallback(operation,
           operation.arguments[:argument_count], cpp_callback_name,
@@ skipping 392 matching lines @@
             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,
       static, return_type, parameters, native_suffix, is_custom,
       auto_scope_setup=True, emit_metadata=True, emit_to_native=False,
-      native_entry=None):
+      native_entry=None, wrap_unwrap_list=[]):
     metadata = []
     if emit_metadata:
       metadata = self._metadata.GetFormattedMetadata(
           self._renamer.GetLibraryName(self._interface),
           self._interface, idl_name, '  ')
 
     if (native_entry):
         dart_native_name, native_binding = native_entry
     else:
         dart_native_name = \
             self.DeriveNativeName(idl_name, native_suffix)
         native_binding_id = self._interface.id
         native_binding_id = TypeIdToBlinkName(native_binding_id, self._database)
         native_binding = \
             '%s_%s_%s' % (native_binding_id, idl_name, native_suffix)
 
     if not static:
         formals = ", ".join(['mthis'] + parameters)
-        actuals = ", ".join(['this'] + parameters)
+        if wrap_unwrap_list and wrap_unwrap_list[1]:
+            actuals = ", ".join(['unwrap_jso(this)'] + parameters)
+        else:
+            actuals = ", ".join(['this'] + parameters)
     else:
         formals = ", ".join(parameters)
         actuals = ", ".join(parameters)
 
     if not emit_to_native:
         caller_emitter = self._members_emitter
         full_dart_name = \
             self.DeriveQualifiedBlinkName(self._interface.id,
                                           dart_native_name)
         if IsPureInterface(self._interface.id):
             caller_emitter.Emit(
                 '\n'
                 '  $METADATA$DART_DECLARATION;\n',
                 METADATA=metadata,
                 DART_DECLARATION=dart_declaration)
         else:
-            caller_emitter.Emit(
-                '\n'
-                '  $METADATA$DART_DECLARATION => $DART_NAME($ACTUALS);\n',
-                METADATA=metadata,
-                DART_DECLARATION=dart_declaration,
-                DART_NAME=full_dart_name,
-                ACTUALS=actuals)
+            emit_template = '''
+  $METADATA$DART_DECLARATION => $DART_NAME($ACTUALS);
+  '''
+            if wrap_unwrap_list and wrap_unwrap_list[0]:
+                emit_jso_template = '''
+  $METADATA$DART_DECLARATION => %s($DART_NAME($ACTUALS));
+  '''
+                if return_type == 'Rectangle':
+                    jso_util_method = 'make_dart_rectangle'
+                # TODO(terry): More checks that the return is a List<Node>.
+                elif return_type.startswith('List<'):
+                    jso_util_method = 'wrap_jso_list'
+                else:
+                    jso_util_method = 'wrap_jso'
+                # Always return List<String> unwrapped.
+                if return_type != 'List<String>':
+                  emit_template = emit_jso_template % jso_util_method
+            caller_emitter.Emit(emit_template,
+                                METADATA=metadata,
+                                DART_DECLARATION=dart_declaration,
+                                DART_NAME=full_dart_name,
+                                ACTUALS=actuals)
     cpp_callback_name = '%s%s' % (idl_name, native_suffix)
 
     self._cpp_resolver_emitter.Emit(
         '    if (argumentCount == $ARGC && name == "$NATIVE_BINDING") {\n'
         '        *autoSetupScope = $AUTO_SCOPE_SETUP;\n'
         '        return Dart$(INTERFACE_NAME)Internal::$CPP_CALLBACK_NAME;\n'
         '    }\n',
         ARGC=argument_count,
         NATIVE_BINDING=native_binding,
         INTERFACE_NAME=self._interface.id,
@@ skipping 258 matching lines @@
 
 def _IsCustom(op_or_attr):
   assert(isinstance(op_or_attr, IDLMember))
   return 'Custom' in op_or_attr.ext_attrs or 'DartCustom' in op_or_attr.ext_attrs
 
 def _IsCustomValue(op_or_attr, value):
   if _IsCustom(op_or_attr):
     return op_or_attr.ext_attrs.get('Custom') == value \
            or op_or_attr.ext_attrs.get('DartCustom') == value
   return False