Reapply Futureification.

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
 
 html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', {
     'CDATASection': 'CDataSection',
     'Clipboard': 'DataTransfer',
     'Database': 'SqlDatabase', # Avoid conflict with Index DB's Database.
     'DatabaseSync': 'SqlDatabaseSync',
     'DOMApplicationCache': 'ApplicationCache',
     'DOMCoreException': 'DomException',
     'DOMFileSystem': 'FileSystem',
     'DOMFileSystemSync': 'FileSystemSync',
     'DOMFormData': 'FormData',
     'DOMURL': 'Url',
     'DOMWindow': 'Window',
+    'EntryCallback': '_EntryCallback',
+    'EntriesCallback': '_EntriesCallback',
+    'ErrorCallback': '_ErrorCallback',
+    'FileCallback': '_FileCallback',
+    'FileSystemCallback': '_FileSystemCallback',
+    'FileWriterCallback': '_FileWriterCallback',
     'HTMLDocument' : 'HtmlDocument',
     'IDBFactory': 'IdbFactory', # Manual to avoid name conflicts.
     'NamedNodeMap': '_NamedNodeMap',
     'NavigatorUserMediaErrorCallback': '_NavigatorUserMediaErrorCallback',
     'NavigatorUserMediaSuccessCallback': '_NavigatorUserMediaSuccessCallback',
+    'NotificationPermissionCallback': '_NotificationPermissionCallback',
     'PositionCallback': '_PositionCallback',
     'PositionErrorCallback': '_PositionErrorCallback',
     'Rect': 'CssRect',
     'RGBColor': 'CssRgbColor',
+    'RTCErrorCallback': '_RtcErrorCallback',
+    'RTCSessionDescriptionCallback': '_RtcSessionDescriptionCallback',
+    'StorageInfoErrorCallback': '_StorageInfoErrorCallback',
+    'StorageInfoUsageCallback': '_StorageInfoUsageCallback',
+    'StringCallback': '_StringCallback',
     'SVGDocument': 'SvgDocument', # Manual to avoid name conflicts.
     'SVGElement': 'SvgElement', # Manual to avoid name conflicts.
     'SVGException': 'SvgException', # Manual of avoid conflict with Exception.
     'SVGSVGElement': 'SvgSvgElement', # Manual to avoid name conflicts.
     'WebGLVertexArrayObjectOES': 'WebGLVertexArrayObject',
     'WebKitAnimationEvent': 'AnimationEvent',
     'WebKitCSSKeyframeRule': 'CssKeyframeRule',
     'WebKitCSSKeyframesRule': 'CssKeyframesRule',
     'WebKitCSSMatrix': 'CssMatrix',
     'WebKitCSSTransformValue': 'CssTransformValue',
@@ skipping 34 matching lines @@
   'SVGHKernElement',
   'SVGMissingGlyphElement',
   'SVGMPathElement',
   'SVGTRefElement',
   'SVGVKernElement',
 ]
 
 for interface in _removed_html_interfaces:
   html_interface_renames[interface] = '_' + interface
 
+convert_to_future_members = monitored.Set(
+    'htmlrenamer.converted_to_future_members', [
+  'DataTransferItem.getAsString',
+  'DirectoryEntry.getDirectory',
+  'DirectoryEntry.getFile',
+  'DirectoryEntry.removeRecursively',
+  'DirectoryReader.readEntries',
+  'DOMWindow.webkitRequestFileSystem',
+  'DOMWindow.webkitResolveLocalFileSystemURL',
+  'Entry.copyTo',
+  'Entry.getMetadata',
+  'Entry.getParent',
+  'Entry.moveTo',
+  'Entry.remove',
+  'FileEntry.createWriter',
+  'FileEntry.file',
+  'Notification.requestPermission',
+  'NotificationCenter.requestPermission',
+  'RTCPeerConnection.createAnswer',
+  'RTCPeerConnection.createOffer',
+  'RTCPeerConnection.setLocalDescription',
+  'RTCPeerConnection.setRemoteDescription',
+  'StorageInfo.queryUsageAndQuota',
+  'StorageInfo.requestQuota',
+  'WorkerContext.webkitResolveLocalFileSystemURL',
+])
+
 # 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', [
   'CompositionEvent.initCompositionEvent',
   'CustomEvent.initCustomEvent',
   'DeviceOrientationEvent.initDeviceOrientationEvent',
   'Document.createElement',
   'Document.createElementNS',
   'Document.createEvent',
@@ skipping 136 matching lines @@
     'DOMURL.revokeObjectURL': 'revokeObjectUrl',
     'DOMWindow.clearTimeout': '_clearTimeout',
     'DOMWindow.clearInterval': '_clearInterval',
     'DOMWindow.setTimeout': '_setTimeout',
     'DOMWindow.setInterval': '_setInterval',
     'DOMWindow.webkitConvertPointFromNodeToPage': 'convertPointFromNodeToPage',
     'DOMWindow.webkitConvertPointFromPageToNode': 'convertPointFromPageToNode',
     'DOMWindow.webkitNotifications': 'notifications',
     'DOMWindow.webkitRequestFileSystem': 'requestFileSystem',
     'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl',
-    'DOMWindow.webkitRequestFileSystem': 'requestFileSystem',
-    'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl',
     'Element.webkitCreateShadowRoot': 'createShadowRoot',
     'Element.webkitMatchesSelector' : 'matches',
     'Navigator.webkitGetUserMedia': '_getUserMedia',
     'Node.cloneNode': 'clone',
     'Node.nextSibling': 'nextNode',
     'Node.ownerDocument': 'document',
     'Node.parentElement': 'parent',
     'Node.previousSibling': 'previousNode',
     'Node.textContent': 'text',
     'SVGElement.className': '$dom_svgClassName',
     'WorkerContext.webkitRequestFileSystem': 'requestFileSystem',
     'WorkerContext.webkitRequestFileSystemSync': 'requestFileSystemSync',
     'WorkerContext.webkitResolveLocalFileSystemSyncURL':
         'resolveLocalFileSystemSyncUrl',
     'WorkerContext.webkitResolveLocalFileSystemURL':
         'resolveLocalFileSystemUrl',
 })
 
+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', [
     'Attr.*',
     'CanvasRenderingContext2D.clearShadow',
@@ skipping 364 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)