Making almost all dom_ methods private. Exceptions will be addressed in a later CL.

tools/dom/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 logging
 import monitored
 import re
 
 typed_array_renames = {
     'ArrayBuffer': 'ByteBuffer',
@@ skipping 134 matching lines @@
   'FileEntry.file',
   'Notification.requestPermission',
   'NotificationCenter.requestPermission',
   'RTCPeerConnection.setLocalDescription',
   'RTCPeerConnection.setRemoteDescription',
   'StorageInfo.requestQuota',
   'WorkerGlobalScope.webkitResolveLocalFileSystemURL',
   'WorkerGlobalScope.webkitRequestFileSystem',
 ])
 
+# "Private" members in the form $dom_foo.
+# TODO(efortuna): Remove this set. This allows us to make the change of removing
+# $dom in installments instead of all at once, but the intent is to move all of
+# these either into private_html_members or remove them from this list entirely.
+dom_private_html_members = monitored.Set('htmlrenamer.private_html_members', [
+  'Document.createElement',
+  'Document.createElementNS',
+  'Document.createRange',
+  'Element.getAttribute',
+  'Element.getAttributeNS',
+  'Element.setAttribute',
+  'Element.setAttributeNS',
+  'EventTarget.addEventListener',
+  'EventTarget.removeEventListener',
+  'Node.childNodes',
+])
+
 # Members from the standard dom that should not be exposed publicly in dart:html
 # but need to be exposed internally to implement dart:html on top of a standard
-# browser.
+# browser. They are exposed simply by placing an underscore in front of the
+# name.
 private_html_members = monitored.Set('htmlrenamer.private_html_members', [
   'AudioNode.connect',
   'CanvasRenderingContext2D.arc',
+  'CanvasRenderingContext2D.drawImage',
   'CompositionEvent.initCompositionEvent',
   'CustomEvent.initCustomEvent',
+  'CSSStyleDeclaration.getPropertyValue',
+  'CSSStyleDeclaration.setProperty',
+  'CSSStyleDeclaration.var',
   'DeviceOrientationEvent.initDeviceOrientationEvent',
-  'Document.createElement',
-  'Document.createElementNS',
   'Document.createEvent',
   'Document.createNodeIterator',
-  'Document.createRange',
   'Document.createTextNode',
   'Document.createTouch',
   'Document.createTouchList',
   'Document.createTreeWalker',
   'Document.querySelectorAll',
+  'DocumentFragment.querySelector',
+  'DocumentFragment.querySelectorAll',
 
   # Moved to HTMLDocument.
   'Document.body',
   'Document.caretRangeFromPoint',
   'Document.elementFromPoint',
   'Document.getCSSCanvasContext',
   'Document.head',
   'Document.lastModified',
   'Document.preferredStylesheetSet',
   'Document.referrer',
   'Document.selectedStylesheetSet',
   'Document.styleSheets',
   'Document.title',
   'Document.webkitCancelFullScreen',
   'Document.webkitExitFullscreen',
   'Document.webkitExitPointerLock',
   'Document.webkitFullscreenElement',
   'Document.webkitFullscreenEnabled',
   'Document.webkitHidden',
   'Document.webkitIsFullScreen',
   'Document.webkitPointerLockElement',
   'Document.webkitVisibilityState',
 
-  'DocumentFragment.querySelector',
-  'DocumentFragment.querySelectorAll',
+  'Element.children',
   'Element.childElementCount',
-  'Element.children',
   'Element.firstElementChild',
-  'ParentNode.childElementCount',
-  'ParentNode.children',
-  'ParentNode.firstElementChild',
-  'Element.getAttribute',
-  'Element.getAttributeNS',
   'Element.getElementsByTagName',
+  'Element.scrollIntoView',
+  'Element.scrollIntoViewIfNeeded',
+  'Element.removeAttribute',
+  'Element.removeAttributeNS',
   'Element.hasAttribute',
   'Element.hasAttributeNS',
-  'ParentNode.lastElementChild',
   'Element.querySelectorAll',
-  'Element.removeAttribute',
-  'Element.removeAttributeNS',
-  'Element.scrollIntoView',
-  'Element.scrollIntoViewIfNeeded',
-  'Element.setAttributeNS',
-  'Element.setAttribute',
-  'Element.setAttributeNS',
   'Event.initEvent',
-  'EventTarget.addEventListener',
-  'EventTarget.removeEventListener',
   'Geolocation.clearWatch',
   'Geolocation.getCurrentPosition',
   'Geolocation.watchPosition',
   'HashChangeEvent.initHashChangeEvent',
   'HTMLCanvasElement.toDataURL',
   'HTMLTableElement.createCaption',
-  'HTMLTableElement.createTBody',
   'HTMLTableElement.createTFoot',
   'HTMLTableElement.createTHead',
+  'HTMLTableElement.createTBody',
   'HTMLTableElement.insertRow',
   'HTMLTableElement.rows',
   'HTMLTableElement.tBodies',
   'HTMLTableRowElement.cells',
   'HTMLTableRowElement.insertCell',
   'HTMLTableSectionElement.insertRow',
   'HTMLTableSectionElement.rows',
   'HTMLTemplateElement.content',
   'IDBCursor.delete',
   'IDBCursor.update',
@@ skipping 20 matching lines @@
   'MouseEvent.initMouseEvent',
   'MouseEvent.clientX',
   'MouseEvent.clientY',
   'MouseEvent.webkitMovementX',
   'MouseEvent.webkitMovementY',
   'MouseEvent.offsetX',
   'MouseEvent.offsetY',
   'MouseEvent.screenX',
   'MouseEvent.screenY',
   'MutationEvent.initMutationEvent',
+  'MutationObserver.observe',
   'Node.attributes',
-  'Node.childNodes',
   'Node.localName',
   'Node.namespaceURI',
   'Node.removeChild',
   'Node.replaceChild',
+  'ParentNode.childElementCount',
+  'ParentNode.children',
+  'ParentNode.firstElementChild',
+  'ParentNode.lastElementChild',
+  'RTCPeerConnection.createAnswer',
+  'RTCPeerConnection.createOffer',
   'Screen.availHeight',
   'Screen.availLeft',
   'Screen.availTop',
   'Screen.availWidth',
   'Storage.clear',
   'Storage.getItem',
   'Storage.key',
   'Storage.length',
   'Storage.removeItem',
   'Storage.setItem',
   'StorageEvent.initStorageEvent',
+  'StorageInfo.queryUsageAndQuota',
   'TextEvent.initTextEvent',
   'Touch.clientX',
   'Touch.clientY',
   'Touch.pageX',
   'Touch.pageY',
   'Touch.screenX',
   'Touch.screenY',
   'TouchEvent.initTouchEvent',
   'UIEvent.charCode',
   'UIEvent.initUIEvent',
   'UIEvent.keyCode',
   'UIEvent.layerX',
   'UIEvent.layerY',
   'UIEvent.pageX',
   'UIEvent.pageY',
+  'WebGLRenderingContext.texImage2D',
   'WheelEvent.initWebKitWheelEvent',
+  'WheelEvent.wheelDeltaX',
+  'WheelEvent.wheelDeltaY',
+  'Window.createImageBitmap',
   'Window.getComputedStyle',
   'Window.moveTo',
+  'Window.clearTimeout',
+  'Window.clearInterval',
+  'Window.setTimeout',
+  'Window.setInterval',
 ])
 
 # Members from the standard dom that exist in the dart:html library with
 # identical functionality but with cleaner names.
 renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', {
-    'CanvasRenderingContext2D.drawImage': '_drawImage',
     'WebKitCSSKeyframesRule.insertRule': 'appendRule',
-    'CSSStyleDeclaration.getPropertyValue': '_getPropertyValue',
-    'CSSStyleDeclaration.setProperty': '_setProperty',
-    'CSSStyleDeclaration.var': '_var',
     'DirectoryEntry.getDirectory': '_getDirectory',
     'DirectoryEntry.getFile': '_getFile',
     'Document.createCDATASection': 'createCDataSection',
     'Document.defaultView': 'window',
     'Document.querySelector': 'query',
     'Window.CSS': 'css',
-    'Window.clearTimeout': '_clearTimeout',
-    'Window.clearInterval': '_clearInterval',
-    'Window.setTimeout': '_setTimeout',
-    'Window.setInterval': '_setInterval',
     'Window.webkitConvertPointFromNodeToPage': '_convertPointFromNodeToPage',
     'Window.webkitConvertPointFromPageToNode': '_convertPointFromPageToNode',
     'Window.webkitNotifications': 'notifications',
     'Window.webkitRequestFileSystem': '_requestFileSystem',
     'Window.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl',
     'Element.querySelector': 'query',
     'Element.webkitMatchesSelector' : 'matches',
-    'MutationObserver.observe': '_observe',
     'Navigator.webkitGetUserMedia': '_getUserMedia',
     'Node.appendChild': 'append',
     'Node.cloneNode': 'clone',
     'Node.nextSibling': 'nextNode',
     'Node.ownerDocument': 'document',
     'Node.parentElement': 'parent',
     'Node.previousSibling': 'previousNode',
     'Node.textContent': 'text',
-    'RTCPeerConnection.createAnswer': '_createAnswer',
-    'RTCPeerConnection.createOffer': '_createOffer',
-    'StorageInfo.queryUsageAndQuota': '_queryUsageAndQuota',
-    'SVGElement.className': '$dom_svgClassName',
+    'SVGElement.className': '_svgClassName',
     'SVGStopElement.offset': 'gradientOffset',
     'URL.createObjectURL': 'createObjectUrl',
     'URL.revokeObjectURL': 'revokeObjectUrl',
-    'WebGLRenderingContext.texImage2D': '_texImage2D',
     'WebGLRenderingContext.texSubImage2D': '_texSubImageImage2D',
-    'WheelEvent.wheelDeltaX': '_wheelDeltaX',
-    'WheelEvent.wheelDeltaY': '_wheelDeltaY',
-    'Window.createImageBitmap': '_createImageBitmap',
     #'WorkerContext.webkitRequestFileSystem': '_requestFileSystem',
     #'WorkerContext.webkitRequestFileSystemSync': '_requestFileSystemSync',
 })
 
 # Members that have multiple definitions, but their types are vary, so we rename
 # them to make them distinct.
 renamed_overloads = monitored.Dict('htmldartgenreator.renamed_overloads', {
   'AudioContext.createBuffer(ArrayBuffer buffer, boolean mixToMono)':
       'createBufferFromBuffer',
   'CSS.supports(DOMString conditionText)': 'supportsCondition',
@@ skipping 419 matching lines @@
       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('_'):  # e.g. _svgClassName
+        target_name = '_' + target_name
+    elif self._FindMatch(interface, member, member_prefix,
+        dom_private_html_members):
       if not target_name.startswith('$dom_'):  # e.g. $dom_svgClassName
         target_name = '$dom_' + target_name
 
     if not name and target_name.startswith('webkit'):
       target_name = member[len('webkit'):]
       target_name = target_name[:1].lower() + target_name[1:]
 
     if dartify_name:
       target_name = self._DartifyMemberName(target_name)
     return target_name
@@ skipping 82 matching lines @@
 
     # 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)