Add support for DOM node vs DOM object separation.

lib/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 28 matching lines @@
 
     dart_impl_path = self._FilePathForDartImplementation(interface_name)
     self._dom_impl_files.append(dart_impl_path)
 
     cpp_header_path = self._FilePathForCppHeader(interface_name)
     self._cpp_header_files.append(cpp_header_path)
 
     cpp_impl_path = self._FilePathForCppImplementation(interface_name)
     self._cpp_impl_files.append(cpp_impl_path)
 
-    return NativeImplementationGenerator(self, interface, super_interface_name,
+    return NativeImplementationGenerator(self, interface,
         self._emitters.FileEmitter(dart_impl_path),
         self._emitters.FileEmitter(cpp_header_path),
         self._emitters.FileEmitter(cpp_impl_path),
         self._BaseDefines(interface),
         self._templates)
 
   def ProcessCallback(self, interface, info):
     self._interface = interface
 
     dart_interface_path = self._FilePathForDartInterface(self._interface.id)
@@ skipping 128 matching lines @@
   def _FilePathForCppHeader(self, interface_name):
     return os.path.join(self._output_dir, 'cpp', 'Dart%s.h' % interface_name)
 
   def _FilePathForCppImplementation(self, interface_name):
     return os.path.join(self._output_dir, 'cpp', 'Dart%s.cpp' % interface_name)
 
 
 class NativeImplementationGenerator(systemwrapping.WrappingInterfaceGenerator):
   """Generates Dart implementation for one DOM IDL interface."""
 
-  def __init__(self, system, interface, super_interface,
+  def __init__(self, system, interface,
                dart_impl_emitter, cpp_header_emitter, cpp_impl_emitter,
                base_members, templates):
     """Generates Dart and C++ code for the given interface.
 
     Args:
       system: The NativeImplementationSystem.
       interface: an IDLInterface instance. It is assumed that all types have
           been converted to Dart types (e.g. int, String), unless they are in
           the same package as the interface.
-      super_interface: A string or None, the name of the common interface that
-         this interface implements, if any.
       dart_impl_emitter: an Emitter for the file containing the Dart
          implementation class.
       cpp_header_emitter: an Emitter for the file containing the C++ header.
       cpp_impl_emitter: an Emitter for the file containing the C++
          implementation.
       base_members: a set of names of members defined in a base class.  This is
           used to avoid static member 'overriding' in the generated Dart code.
     """
     self._system = system
     self._interface = interface
-    self._super_interface = super_interface
     self._dart_impl_emitter = dart_impl_emitter
     self._cpp_header_emitter = cpp_header_emitter
     self._cpp_impl_emitter = cpp_impl_emitter
     self._base_members = base_members
     self._templates = templates
     self._current_secondary_parent = None
 
   def StartInterface(self):
     self._class_name = self._ImplClassName(self._interface.id)
     self._interface_type_info = GetIDLTypeInfo(self._interface.id)
@@ skipping 152 matching lines @@
           'inline Dart_Handle toDartValue($(WEBCORE_CLASS_NAME)* value)\n'
           '{\n'
           '    return DartDOMWrapper::toDart<Dart$(INTERFACE)>(value);\n'
           '}\n')
     to_dart_value_emitter = emitter.Emitter()
     to_dart_value_emitter.Emit(
         to_dart_value_template,
         INTERFACE=self._interface.id,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type())
 
+
+    wrapper_type = _DOMWrapperType(self._system._database, self._interface)
     self._cpp_header_emitter.Emit(
         self._templates.Load('cpp_header.template'),
         INTERFACE=self._interface.id,
         WEBCORE_INCLUDES=webcore_includes,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type(),
         TO_DART_VALUE=to_dart_value_emitter.Fragments(),
-        DECLARATIONS=self._cpp_declarations_emitter.Fragments())
+        DECLARATIONS=self._cpp_declarations_emitter.Fragments(),
+        NATIVE_TRAITS_TYPE='DartDOMWrapper::%sTraits' % wrapper_type)
 
   def _GenerateCallWithHandling(self, node, parameter_definitions_emitter, arguments):
     if 'CallWith' not in node.ext_attrs:
       return False
 
     call_with = node.ext_attrs['CallWith']
     if call_with == 'ScriptExecutionContext':
       parameter_definitions_emitter.Emit(
           '\n'
           '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
@@ skipping 421 matching lines @@
 
     if 'ImplementedBy' in attributes:
       arguments.insert(0, 'receiver')
       self._cpp_impl_includes.add('"%s.h"' % attributes['ImplementedBy'])
 
     return emitter.Format(invocation_template,
         FUNCTION_CALL='%s(%s)' % (function_expression, ', '.join(arguments)))
 
 def _GenerateCPPIncludes(includes):
   return ''.join(['#include %s\n' % include for include in includes])
+
+def _DOMWrapperType(database, idl_type):
+  if _IsNodeSubType(database, idl_type):

[Anton Muhin, 2012/04/04 18:41:56]

will it return true for Node itself?

[podivilov, 2012/04/04 18:50:25]

Done.

+    return 'DOMNode'
+  return 'DOMObject'
+
+def _IsNodeSubType(database, idl_type):

[Anton Muhin, 2012/04/04 18:41:56]

is it possible to restructure it like:

def _INST(...):
  if type_name == 'Node': return True
  for parent in idl_type.parents:
   if database.HasInterface...

?

[podivilov, 2012/04/04 18:50:25]

Done.

+  for parent in idl_type.parents:
+    type_name = parent.type.id
+    if type_name == 'Node':
+      return True
+    if database.HasInterface(type_name):
+      parent_idl_type = database.GetInterface(type_name)

[Anton Muhin, 2012/04/04 18:41:56]

is it possible to combine Has and Get Interface?  check for None?

[podivilov, 2012/04/04 18:50:25]

It might be a good idea, but refactoring of database interface is definitely
outside of this cl's scope.

+      if _IsNodeSubType(database, parent_idl_type):
+        return True
+  return False