Revert "Removing some deprecated members"

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 138 matching lines @@
   'RTCPeerConnection.setLocalDescription',
   'RTCPeerConnection.setRemoteDescription',
   'StorageInfo.requestQuota',
   'StorageQuota.requestQuota',
   'Window.webkitRequestFileSystem',
   'Window.webkitResolveLocalFileSystemURL',
   'WorkerGlobalScope.webkitRequestFileSystem',
   'WorkerGlobalScope.webkitResolveLocalFileSystemURL',
 ])
 
+# "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', [
+  'EventTarget.addEventListener',
+  'EventTarget.removeEventListener',
+])
+
 # Classes where we have customized constructors, but we need to keep the old
 # constructor for dispatch purposes.
 custom_html_constructors = monitored.Set(
     'htmlrenamer.custom_html_constructors', [
   'HTMLOptionElement',
   'MutationObserver',
 ])
 
 # 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
@@ skipping 48 matching lines @@
   'Element.getElementsByTagName',
   'Element.scrollIntoView',
   'Element.scrollIntoViewIfNeeded',
   'Element.removeAttribute',
   'Element.removeAttributeNS',
   'Element.hasAttribute',
   'Element.hasAttributeNS',
   'Element.innerHTML',
   'Element.querySelectorAll',
   'Event.initEvent',
-  'EventTarget.addEventListener',
-  'EventTarget.removeEventListener',
   'Geolocation.clearWatch',
   'Geolocation.getCurrentPosition',
   'Geolocation.watchPosition',
   'HashChangeEvent.initHashChangeEvent',
   'HTMLCanvasElement.toDataURL',
   'HTMLTableElement.createCaption',
   'HTMLTableElement.createTFoot',
   'HTMLTableElement.createTHead',
   'HTMLTableElement.createTBody',
   'HTMLTableElement.insertRow',
@@ skipping 514 matching lines @@
 })
 
 _library_ids = monitored.Dict('htmlrenamer._library_names', {
   'ANGLEInstancedArrays': 'WebGl',
   'Database': 'WebSql',
   'Navigator': 'Html',
   'Window': 'Html',
 })
 
 class HtmlRenamer(object):
-  def __init__(self, database, metadata):
+  def __init__(self, database):
     self._database = database
-    self._metadata = metadata
 
   def RenameInterface(self, interface):
     if 'Callback' in interface.ext_attrs:
       if interface.id in _removed_html_interfaces:
         return None
 
     candidate = self.RenameInterfaceId(interface.id)
     if candidate:
       return candidate
 
@@ skipping 27 matching lines @@
     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
 
   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):
       return True
     if interface.id in _removed_html_interfaces:
       return True
-    metadata_member = member
-    if member_prefix == 'on:':
-      metadata_member = 'on' + metadata_member.lower()
-    if self._metadata.IsDeprecated(interface, metadata_member):
-      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
 
   def _FindMatch(self, interface, member, member_prefix, candidates):
     for interface in self._database.Hierarchy(interface):
       member_name = interface.id + '.' + member
@@ skipping 95 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)