Reapply expanding overloaded functions into separate functions.

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 133 matching lines @@
   'RTCPeerConnection.setLocalDescription',
   'RTCPeerConnection.setRemoteDescription',
   'StorageInfo.requestQuota',
   'WorkerContext.webkitResolveLocalFileSystemURL',
   'WorkerContext.webkitRequestFileSystem',
 ])
 
 # 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.
-_private_html_members = monitored.Set('htmlrenamer._private_html_members', [
+private_html_members = monitored.Set('htmlrenamer.private_html_members', [
+  'AudioNode.connect',
   'CanvasRenderingContext2D.arc',
   'CompositionEvent.initCompositionEvent',
   'CustomEvent.initCustomEvent',
   'DeviceOrientationEvent.initDeviceOrientationEvent',
   'Document.createElement',
   'Document.createElementNS',
   'Document.createEvent',
   'Document.createNodeIterator',
   'Document.createRange',
   'Document.createTextNode',
@@ skipping 176 matching lines @@
     'URL.createObjectURL': 'createObjectUrl',
     'URL.revokeObjectURL': 'revokeObjectUrl',
     'WebGLRenderingContext.texImage2D': '_texImage2D',
     'WebGLRenderingContext.texSubImage2D': '_texSubImageImage2D',
     'WheelEvent.wheelDeltaX': '_wheelDeltaX',
     'WheelEvent.wheelDeltaY': '_wheelDeltaY',
     #'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',
+  'CanvasRenderingContext2D.createPattern(HTMLImageElement image, '
+      'DOMString repetitionType)': 'createPatternFromImage',
+  'DataTransferItemList.add(File file)': 'addFile',
+  'DataTransferItemList.add(DOMString data, DOMString type)': 'addData',
+  'FormData.append(DOMString name, Blob value, DOMString filename)':

[Emily Fortuna, 2013/07/02 22:27:30]

also removed due to dartium error. (see below)

+      'appendBlob',
+  'IDBDatabase.transaction(DOMStringList storeNames, DOMString mode)':
+      'transactionStores',
+  'IDBDatabase.transaction(sequence<DOMString> storeNames, DOMString mode)':
+      'transactionList',
+  'IDBDatabase.transaction(DOMString storeName, DOMString mode)':
+      'transactionStore',
+  'RTCDataChannel.send(ArrayBuffer data)': 'sendByteBuffer',
+  'RTCDataChannel.send(ArrayBufferView data)': 'sendTypedData',
+  'RTCDataChannel.send(Blob data)': 'sendBlob',
+  'RTCDataChannel.send(DOMString data)': 'sendString',
+  'URL.createObjectURL(WebKitMediaSource source)':
+      'createObjectUrlFromSource',
+  'URL.createObjectURL(MediaStream stream)': 'createObjectUrlFromStream',
+  'URL.createObjectURL(Blob blob)': 'createObjectUrlFromBlob',
+  'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
+      'unsigned long internalformat, long width, long height, long border, '
+      'unsigned long format, unsigned long type, ArrayBufferView pixels)':
+      'texImage2DTypedData',
+  'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
+      'unsigned long internalformat, unsigned long format, unsigned long '
+      'type, HTMLImageElement image)': 'texImage2DImage',
+  'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
+      'unsigned long internalformat, unsigned long format, unsigned long '
+      'type, HTMLCanvasElement canvas)': 'texImage2DCanvas',
+  'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
+      'unsigned long internalformat, unsigned long format, unsigned long '
+      'type, HTMLVideoElement video)': 'texImage2DVideo',
+  'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
+      'long xoffset, long yoffset, long width, long height, unsigned long '
+      'format, unsigned long type, ArrayBufferView pixels)':
+      'texSubImage2DTypedData',
+  'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
+      'long xoffset, long yoffset, unsigned long format, unsigned long type, '
+      'HTMLImageElement image)': 'texSubImage2DImage',
+  'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
+      'long xoffset, long yoffset, unsigned long format, unsigned long type, '
+      'HTMLCanvasElement canvas)': 'texSubImage2DCanvas',
+  'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
+      'long xoffset, long yoffset, unsigned long format, unsigned long type, '
+      'HTMLVideoElement video)': 'texSubImage2DVideo',
+  'WebGLRenderingContext.bufferData(unsigned long target, ArrayBuffer data, '
+      'unsigned long usage)': 'bufferByteData',
+  'WebGLRenderingContext.bufferData(unsigned long target, '
+      'ArrayBufferView data, unsigned long usage)': 'bufferTypedData',
+  'WebGLRenderingContext.bufferSubData(unsigned long target, '
+      'long long offset, ArrayBuffer data)': 'bufferSubByteData',
+  'WebGLRenderingContext.bufferSubData(unsigned long target, '
+      'long long offset, ArrayBufferView data)': 'bufferSubTypedData',
+  'WebSocket.send(ArrayBuffer data)': 'sendByteBuffer',

[Emily Fortuna, 2013/07/02 22:27:30]

these renames were removed to avoid a dartium error. I'll add them back in once
I get a chance to talk with those with more dartium expertise (everyone's on
vacation right now!)

+  'WebSocket.send(ArrayBufferView data)': 'sendTypeData',
+  'WebSocket.send(DOMString data)': 'sendString',
+  'WebSocket.send(Blob data)': 'sendBlob'
+})
+
+# Members that have multiple definitions, but their types are identical (only
+# number of arguments vary), so we do not rename them as a _raw method.
+keep_overloaded_members = monitored.Set(
+    'htmldartgenerator.keep_overloaded_members', [
+  'AudioBufferSourceNode.start',
+  'CanvasRenderingContext2D.putImageData',
+  'CanvasRenderingContext2D.webkitPutImageDataHD',
+  'DataTransferItemList.add',
+  'HTMLInputElement.setRangeText',
+  'HTMLTextAreaElement.setRangeText',
+  'IDBDatabase.transaction',
+  'RTCDataChannel.send',
+  'URL.createObjectURL',
+  'WebSocket.send',
+  'XMLHttpRequest.send'
+])
+
 for member in convert_to_future_members:
   if member in renamed_html_members:
     renamed_html_members[member] = '_' + renamed_html_members[member]
   else:
     renamed_html_members[member] = '_' + member[member.find('.') + 1 :]
 
 # Members and classes from the dom that should be removed completely 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\:|call\:|on\:)?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.
-_removed_html_members = monitored.Set('htmlrenamer._removed_html_members', [
+removed_html_members = monitored.Set('htmlrenamer.removed_html_members', [
     'AudioBufferSourceNode.looping', # TODO(vsm): Use deprecated IDL annotation
     'CSSStyleDeclaration.getPropertyCSSValue',
     'CanvasRenderingContext2D.clearShadow',
     'CanvasRenderingContext2D.drawImageFromRect',
     'CanvasRenderingContext2D.setAlpha',
     'CanvasRenderingContext2D.setCompositeOperation',
     'CanvasRenderingContext2D.setFillColor',
     'CanvasRenderingContext2D.setLineCap',
     'CanvasRenderingContext2D.setLineJoin',
     'CanvasRenderingContext2D.setLineWidth',
@@ skipping 293 matching lines @@
     if self.ShouldSuppressMember(interface, member, member_prefix):
       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 self._FindMatch(interface, member, member_prefix, 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
 
   def ShouldSuppressMember(self, interface, member, member_prefix=''):
     """ Returns true if the member should be suppressed."""
-    if self._FindMatch(interface, member, member_prefix,
-        _removed_html_members):
+    if self._FindMatch(interface, member, member_prefix, removed_html_members):
       return True
     if interface.id in _removed_html_interfaces:
       return True
     return False
 
   def ShouldSuppressInterface(self, interface):
     """ Returns true if the interface should be suppressed."""
     if interface.id in _removed_html_interfaces:
       return True
 
@@ skipping 68 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)