Dartifying members.

sdk/lib/html/scripts/htmlrenamer.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.
 import re
 
 html_interface_renames = {
     'DOMCoreException': 'DOMException',
     'DOMFormData': 'FormData',
     'DOMURL': 'Url',
@@ skipping 100 matching lines @@
   'Storage.length',
   'Storage.removeItem',
   'Storage.setItem',
   'WheelEvent.wheelDeltaX',
   'WheelEvent.wheelDeltaY',
 ])
 
 # Members from the standard dom that exist in the dart:html library with
 # identical functionality but with cleaner names.
 _renamed_html_members = {
+    'Document.createCDATASection': 'createCDataSection',
     'Document.defaultView': 'window',
     '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',
@@ skipping 65 matching lines @@
     "Document.getElementsByTagNameNS",
     'Document.webkitCurrentFullScreenElement',
     'Document.webkitFullScreenKeyboardInputAllowed',
     "DocumentType.*",
     "Element.setAttributeNode",
     "Element.getAttributeNode",
     "Element.removeAttributeNode",
     "Element.setAttributeNodeNS",
     "Element.getAttributeNodeNS",
     "Event.srcElement",
+    "EventSource.URL",
     "BodyElement.text",
     "AnchorElement.text",
     "OptionElement.text",
     "ScriptElement.text",
     "TitleElement.text",
 #    "EventSource.get:url",
 # TODO(jacobr): should these be removed?
     "Document.close",
     "Document.hasFocus",
 
@@ skipping 28 matching lines @@
     'Element.scrollIntoView',
     'Element.get:classList',
     "FormElement.get:elements",
     "HTMLFrameElement.*",
     "HTMLFrameSetElement.*",
     "HtmlElement.version",
     "HtmlElement.manifest",
     "Document.version",
     "Document.manifest",
     "HTMLIsIndexElement.*",
+    "HTMLMenuElement.compact",
     "HTMLOptionsCollection.*",
     "HTMLPropertiesCollection.*",
     "SelectElement.remove",
-    "MenuElement.compact",
     "NamedNodeMap.*",
     "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:DOCUMENT_FRAGMENT_NODE",
     "Node.isDefaultNamespace",
@@ skipping 54 matching lines @@
     interface = self._database.GetInterface(interface_name)
 
     if self._FindMatch(interface, member, member_prefix, _removed_html_members):
       return None
 
     if 'CheckSecurityForNode' in member_node.ext_attrs:
       return None
 
     name = self._FindMatch(interface, member, member_prefix,
                            _renamed_html_members)
+
     target_name = _renamed_html_members[name] if name else member
     if self._FindMatch(interface, member, member_prefix, _private_html_members):
       if not target_name.startswith('$dom_'):  # e.g. $dom_svgClassName
         target_name = '$dom_' + target_name
+
+    target_name = self._DartifyMemberName(target_name)
     return target_name
 
   def _FindMatch(self, interface, member, member_prefix, candidates):
     for interface in self._database.Hierarchy(interface):
-      html_interface_name = self.RenameInterface(interface)
+      html_interface_name = self.DartifyTypeName(interface.id)
       member_name = html_interface_name + '.' + member
       if member_name in candidates:
         return member_name
       member_name = html_interface_name + '.' + member_prefix + member
       if member_name in candidates:
         return member_name
 
   def GetLibraryName(self, interface):
     return self._GetLibraryName(interface.id)
 
   def _GetLibraryName(self, idl_type_name):
     """
     Gets the name of the library this type should live in.
     This is private because this should use interfaces to resolve the library.
     """
-
     if idl_type_name.startswith('SVG'):
       return 'svg'
     return 'html'
 
+
   def DartifyTypeName(self, type_name):
     """Converts a DOM name to a Dart-friendly class name. """
     library_name = self._GetLibraryName(type_name)
     # Only renaming SVG for now.
     if library_name != 'svg':
       return type_name
 
     # Strip off the SVG prefix.
     name = re.sub(r'^SVG', '', type_name)
+    return self._CamelCaseName(name)
+
+  def _DartifyMemberName(self, member_name):
+    # Strip off any OpenGL ES suffixes.
+    name = re.sub(r'OES$', '', member_name)
+    return self._CamelCaseName(name)
+
+  def _CamelCaseName(self, name):
 
     def toLower(match):
       return match.group(1) + match.group(2).lower() + match.group(3)
 
     # We're looking for a sequence of letters which start with capital letter
     # then a series of caps and finishes with either the end of the string or
     # a capital letter.
     # The [0-9] check is for names such as 2D or 3D
     # The following test cases should match as:
     #   WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue
     #   XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change)
     #   IFrameElement: (I)()(F)rameElement (no change)
     return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name)