Use original WebKit IDL database for dart:html generation.

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
 import systembase
 from generator import *
 from systemhtml import DomToHtmlEvent, DomToHtmlEvents, HtmlSystemShared
 from systemhtml import HtmlElementConstructorInfos
 from systemhtml import EmitHtmlElementFactoryConstructors
 
 class NativeImplementationSystem(systembase.System):
 
-  def __init__(self, templates, database, html_database, html_renames,
-               emitters, output_dir):
+  def __init__(self, templates, database, emitters, output_dir):
     super(NativeImplementationSystem, self).__init__(
         templates, database, emitters, output_dir)
 
-    self._html_renames = html_renames
     self._dom_impl_files = []
     self._cpp_header_files = []
     self._cpp_impl_files = []
-    self._html_system = HtmlSystemShared(html_database)
+    self._html_system = HtmlSystemShared(database)
     self._factory_provider_emitters = {}
 
   def InterfaceGenerator(self,
                          interface,
                          common_prefix,
                          super_interface_name,
                          source_filter):
     interface_name = interface.id
 
     if IsPureInterface(interface_name):
@@ skipping 177 matching lines @@
     super(NativeImplementationGenerator, self).__init__(system._database)
     self._system = system
     self._interface = 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
     self._html_system = self._system._html_system
+    self._html_renames = self._html_system._html_renames
 
   def StartInterface(self):
     self._interface_type_info = GetIDLTypeInfo(self._interface.id)
     self._members_emitter = emitter.Emitter()
     self._cpp_declarations_emitter = emitter.Emitter()
     self._cpp_impl_includes = set()
     self._cpp_definitions_emitter = emitter.Emitter()
     self._cpp_resolver_emitter = emitter.Emitter()
 
     self._GenerateConstructors()
@@ skipping 139 matching lines @@
         '  $EVENTS_CLASS get on() {\n'
         '    if (_on === null) _on = new $EVENTS_CLASS(this);\n'
         '    return _on;\n'
         '  }\n',
         EVENTS_CLASS=events_class)
 
   def _ImplClassName(self, interface_name):
     return '_%sImpl' % interface_name
 
   def _DartType(self, idl_type):
-    type_info = GetIDLTypeInfo(idl_type)
-    return self._HTMLInterfaceName(type_info.dart_type())
+    return self._html_system.DartType(idl_type)
 
   def _BaseClassName(self):
     if not self._interface.parents:
       return '_DOMWrapperBase'
 
     supertype = self._interface.parents[0].type.id
 
     if IsPureInterface(supertype):    # The class is a root.
       return '_DOMWrapperBase'
 
@@ skipping 11 matching lines @@
       # EventTarget implementation.
       #
       # Applies to MessagePort.
       if not [op for op in self._interface.operations if op.id == 'addEventListener']:
         return self._ImplClassName(supertype)
       return '_DOMWrapperBase'
 
     return self._ImplClassName(supertype)
 
   def _HTMLInterfaceName(self, interface_name):
-    return self._system._html_renames.get(interface_name, interface_name)
+    return self._html_renames.get(interface_name, interface_name)
 
   def _IsConstructable(self):
     # FIXME: support ConstructorTemplate.
     return set(['CustomConstructor', 'V8CustomConstructor', 'Constructor', 'NamedConstructor']) & set(self._interface.ext_attrs)
 
   def _EmitFactoryProvider(self, interface_name, constructor_info):
     dart_impl_path = self._system._FilePathForDartFactoryProviderImplementation(
         interface_name)
     self._system._dom_impl_files.append(dart_impl_path)
 
@@ skipping 121 matching lines @@
 
   def AddConstant(self, constant):
     # Constants are already defined on the interface.
     pass
 
   def AddAttribute(self, getter, setter):
     if 'CheckSecurityForNode' in (getter or setter).ext_attrs:
       # FIXME: exclude from interface as well.
       return
 
-    html_interface_name = self._HTMLInterfaceName(self._interface.id)
     dom_name = DartDomNameOfAttribute(getter or setter)
     html_getter_name = self._html_system.RenameInHtmlLibrary(
-        html_interface_name, dom_name, 'get:', implementation_class=True)
+        self._interface.id, dom_name, 'get:', implementation_class=True)
     html_setter_name = self._html_system.RenameInHtmlLibrary(
-        html_interface_name, dom_name, 'set:', implementation_class=True)
+        self._interface.id, dom_name, 'set:', implementation_class=True)
 
     if getter and html_getter_name:
       self._AddGetter(getter, html_getter_name)
     if setter and html_setter_name:
       self._AddSetter(setter, html_setter_name)
 
   def AddSecondaryAttribute(self, interface, getter, setter):
     self.AddAttribute(getter, setter)
 
   def _AddGetter(self, attr, html_name):
@@ skipping 165 matching lines @@
     Arguments:
       info: An OperationInfo object.
     """
 
     operation = info.operations[0]
 
     if 'CheckSecurityForNode' in operation.ext_attrs:
       # FIXME: exclude from interface as well.
       return
 
-    html_interface_name = self._HTMLInterfaceName(self._interface.id)
     html_name = self._html_system.RenameInHtmlLibrary(
-        html_interface_name, info.name, implementation_class=True)
+        self._interface.id, info.name, implementation_class=True)
 
     if not html_name and info.name == 'item':
       # FIXME: item should be renamed to operator[], not removed.
       html_name = '_item'
 
     if not html_name:
       return
 
     is_custom = 'Custom' in operation.ext_attrs
     has_optional_arguments = any(_IsArgumentOptionalInWebCore(argument) for argument in operation.arguments)
@@ skipping 290 matching lines @@
       continue
     parent_interface = database.GetInterface(parent.type.id)
     if callback(parent_interface):
       return parent_interface
     parent_interface = _FindParent(parent_interface, database, callback)
     if parent_interface:
       return parent_interface
 
 def _IsArgumentOptionalInWebCore(argument):
   return IsOptional(argument) and not 'Callback' in argument.ext_attrs