Cleanup systemhtml name lists so we can reuse them for generating wrapperless dart:html for Dartium.

lib/dom/scripts/systemhtml.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 system to generate
 Dart:html APIs from the IDL database."""
 
 from systemfrog import *
 from systeminterface import *
@@ skipping 55 matching lines @@
   'NodeSelector.querySelectorAll',
   'Storage.length',
   'Storage.clear',
   'Storage.getItem',
   'Storage.key',
   'Storage.removeItem',
   'Storage.setItem',
   'Window.getComputedStyle',
 ])
 
-_manually_generated_html_members = set([
-  'Document.querySelectorAll',

[podivilov, 2012/05/24 08:29:04]

This one is in _private_html_members list already.

-  'Document.querySelector',

[podivilov, 2012/05/24 08:29:04]

Moved to _html_library_custom.

-])
-
 # Members from the standard dom that exist in the dart:html library with
 # identical functionality but with cleaner names.
 _html_library_renames = {
     'Document.defaultView': 'window',
     'DocumentFragment.querySelector': 'query',
     'NodeSelector.querySelector': 'query',
     'Element.querySelector': 'query',
     'Element.webkitMatchesSelector' : 'matchesSelector',
     'Element.scrollIntoViewIfNeeded': 'scrollIntoView',
     'Node.cloneNode': 'clone',
     'Node.nextSibling': 'nextNode',
     'Node.ownerDocument': 'document',
     'Node.parentNode': 'parent',
     'Node.previousSibling': 'previousNode',
     'Node.textContent': 'text',
     'SVGElement.className': '$dom_svgClassName',
     'SVGAnimatedString.className': '$dom_svgClassName',
     'SVGStylable.className': '$dom_svgClassName',
 }
 
-#TODO(jacobr): inject annotations into the interfaces based on this table and
-# on _html_library_renames.
-_injected_doc_fragments = {
-    'Element.query': '  /** @domName Element.querySelector, Document.getElementById */',
-}
 # Members and classes from the dom that should be removed completelly from
 # dart:html.  These could be expressed in the IDL instead but expressing this
 # as a simple table instead is more concise.
 # Syntax is: ClassName.(get\.|set\.)?MemberName
 # Using get: and set: is optional and should only be used when a getter needs
 # to be suppressed but not the setter, etc.
 # TODO(jacobr): cleanup and augment this list.
 _html_library_remove = set([
-    'Window.get:document', # Removed as we have a custom implementation.

[podivilov, 2012/05/24 08:29:04]

This is custom, not removed.

     'NodeList.item',
     "Attr.*",
 #    "BarProp.*",
 #    "BarInfo.*",
 #    "Blob.webkitSlice",
 #    "CDATASection.*",
 #    "Comment.*",
 #    "DOMImplementation.*",
     "Document.get:forms",
 #    "Document.get:selectedStylesheetSet",
@@ skipping 105 matching lines @@
     "Node.isEqualNode",
     "Node.get:TEXT_NODE",
     "Node.hasAttributes",
     "Node.get:DOCUMENT_TYPE_NODE",
     "Node.get:DOCUMENT_POSITION_FOLLOWING",
     "Node.lookupNamespaceURI",
     "Node.get:ELEMENT_NODE",
     "Node.get:namespaceURI",
     "Node.get:DOCUMENT_FRAGMENT_NODE",
     "Node.get:localName",
-    "Node.dispatchEvent",
     "Node.isDefaultNamespace",
     "Node.compareDocumentPosition",
     "Node.get:baseURI",
     "Node.isSameNode",
     "Node.get:DOCUMENT_POSITION_DISCONNECTED",
     "Node.get:DOCUMENT_NODE",
     "Node.get:DOCUMENT_POSITION_CONTAINS",
     "Node.get:COMMENT_NODE",
     "Node.get:ENTITY_REFERENCE_NODE",
     "Node.isSupported",
     "Node.get:DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC",
     "Node.get:NOTATION_NODE",
     "Node.normalize",
     "Node.get:parentElement",
     "Node.get:ATTRIBUTE_NODE",
     "Node.get:ENTITY_NODE",
     "Node.get:DOCUMENT_POSITION_CONTAINED_BY",
     "Node.get:prefix",
     "Node.set:prefix",
     "Node.get:DOCUMENT_POSITION_PRECEDING",
-    "Node.removeEventListener",
     "Node.get:nodeValue",
     "Node.set:nodeValue",
     "Node.get:CDATA_SECTION_NODE",
     "Node.get:nodeName",
-    "Node.addEventListener",
     "Node.lookupPrefix",
     "Node.get:PROCESSING_INSTRUCTION_NODE",
-    "Notification.dispatchEvent",
-    "Notification.addEventListener",
-    "Notification.removeEventListener",

[podivilov, 2012/05/24 08:29:04]

Not sure why those were needed (we have another ~20 event targets which aren't
here).

     "IFrameElement.get:contentDocument",
     "IFrameElement.get:contentWindow",
     "Window.get:frameElement",
-    "Window.get:top",

[podivilov, 2012/05/24 08:29:04]

This is custom, not removed.

+    ])
+
+_html_library_custom = set([
+    'Document.querySelector',
+    'Window.get:document',
+    'Window.get:top',
     ])
 
 # Events without onEventName attributes in the  IDL we want to support.
 # We can automatically extract most event event names by checking for
 # onEventName methods in the IDL but some events aren't listed so we need
 # to manually add them here so that they are easy for users to find.
 _html_manual_events = {
   'Element': ['touchleave', 'touchenter', 'webkitTransitionEnd'],
   'Window': ['DOMContentLoaded']
 }
@@ skipping 216 matching lines @@
       if name in _html_library_renames:
         target_name = _html_library_renames[name]
       name = interface.id + '.' + member_prefix + member
       if name in _html_library_renames:
         target_name = _html_library_renames[name]
 
     if not target_name.startswith('_'):
       if self._PrivateInHtmlLibrary(interface, member, member_prefix):
         if not target_name.startswith('$dom_'):  # e.g. $dom_svgClassName
           target_name = '$dom_' + target_name
-      elif implementation_class and self._ManuallyGeneratedInHtmlLibrary(
-          interface, member, member_prefix):
-        target_name = '_' + target_name
 
     # No rename required
     return target_name
 
   def _PrivateInHtmlLibrary(self, interface, member, member_prefix):
     return self._Matches(interface, member, member_prefix,
         _private_html_members)
 
-  def _ManuallyGeneratedInHtmlLibrary(self, interface, member, member_prefix):
+  def IsCustomInHtmlLibrary(self, interface, member, member_prefix=''):
     return self._Matches(interface, member, member_prefix,
-        _manually_generated_html_members)
+        _html_library_custom)
 
   # TODO(jacobr): this already exists
   def _TraverseParents(self, interface, callback):
     for parent in interface.parents:
       parent_id = parent.type.id
       if self._database.HasInterface(parent_id):
         parent_interface = self._database.GetInterface(parent_id)
         callback(parent_interface)
         self._TraverseParents(parent_interface, callback)
 
@@ skipping 403 matching lines @@
             TYPE=self._NarrowInputType(element_type))
 
     # TODO(sra): Use separate mixins for mutable implementations of List<T>.
     # TODO(sra): Use separate mixins for typed array implementations of List<T>.
     if self._interface.id != 'NodeList':
       template_file = 'immutable_list_mixin.darttemplate'
       template = self._system._templates.Load(template_file)
       self._members_emitter.Emit(template, E=DartType(element_type))
 
   def AddAttribute(self, getter, setter):
-
-    html_getter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, DartDomNameOfAttribute(getter), 'get:',
+    dom_name = DartDomNameOfAttribute(getter or setter)
+    html_getter_name = None
+    if not self._shared.IsCustomInHtmlLibrary(
+        self._interface, dom_name, 'get:'):
+      html_getter_name = self._shared.RenameInHtmlLibrary(
+          self._interface, dom_name, 'get:',
           implementation_class=True)
-    html_setter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, DartDomNameOfAttribute(getter), 'set:',
+    html_setter_name = None
+    if not self._shared.IsCustomInHtmlLibrary(
+        self._interface, dom_name, 'set:'):
+      html_setter_name = self._shared.RenameInHtmlLibrary(
+          self._interface, dom_name, 'set:',
           implementation_class=True)
 
     if not html_getter_name:
       getter = None
     if not html_setter_name:
       setter = None
 
     if not getter and not setter:
       return
 
@@ skipping 70 matching lines @@
         ' native "this.$NAME = value;";\n',
         HTML_NAME=html_name,
         NAME=attr.id,
         TYPE=self._NarrowInputType(attr.type.id))
 
   def AddOperation(self, info):
     """
     Arguments:
       info: An OperationInfo object.
     """
+    if self._shared.IsCustomInHtmlLibrary(self._interface, info.name):
+      return
+
     html_name = self._shared.RenameInHtmlLibrary(
         self._interface, info.name, implementation_class=True)
     if not html_name:
       return
 
     # Do we need a native body?
     if html_name != info.declared_name:
       return_type = self._NarrowOutputType(info.type_name)
 
       operation_emitter = self._members_emitter.Emit('$!SCOPE',
@@ skipping 334 matching lines @@
     pass
 
   def _MethodName(self, prefix, name):
     method_name = prefix + name
     if name in self._base_members:  # Avoid illegal Dart 'static override'.
       method_name = method_name + '_' + self._interface.id
     return method_name
 
   def AddAttribute(self, getter, setter):
     dom_name = DartDomNameOfAttribute(getter or setter)
-    html_getter_name = self._shared.RenameInHtmlLibrary(
-        self._interface, dom_name, 'get:', implementation_class=True)
-    html_setter_name = self._shared.RenameInHtmlLibrary(
-        self._interface, dom_name, 'set:', implementation_class=True)
+    html_getter_name = None
+    if not self._shared.IsCustomInHtmlLibrary(
+        self._interface, dom_name, 'get:'):
+      html_getter_name = self._shared.RenameInHtmlLibrary(
+          self._interface, dom_name, 'get:',
+          implementation_class=True)
+    html_setter_name = None
+    if not self._shared.IsCustomInHtmlLibrary(
+        self._interface, dom_name, 'set:'):
+      html_setter_name = self._shared.RenameInHtmlLibrary(
+          self._interface, 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 _AddGetter(self, attr, html_name):
     self._members_emitter.Emit(
       '\n'
       '  $TYPE get $(HTML_NAME)() => _wrap($(THIS).$DOM_NAME);\n',
@@ skipping 106 matching lines @@
         '  }\n',
         THIS=self.DomObjectName(),
         TYPE=DartType(element_type),
         METHOD=method_name)
 
   def AddOperation(self, info):
     """
     Arguments:
       info: An OperationInfo object.
     """
+    if self._shared.IsCustomInHtmlLibrary(self._interface, info.name):
+      return
+
     html_name = self._shared.RenameInHtmlLibrary(
         self._interface, info.name, implementation_class=True)
 
     if not html_name:
       return
 
     arguments = self._UnwrappedParameters(info, len(info.param_infos))
     function_call = '%s.%s(%s)' % (self.DomObjectName(), info.name, arguments)
     if info.type_name != 'void':
       # We could place the logic for handling Document directly in _wrap
@@ skipping 28 matching lines @@
             Collect(database.GetInterface(parent.type.id),
                     seen, collected)
 
   inheritance_closure = {}
   for interface in database.GetInterfaces():
     seen = set()
     collected = []
     Collect(interface, seen, collected)
     inheritance_closure[interface.id] = collected
   return inheritance_closure