Version 0.8.10.1

dart/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 456 matching lines @@
     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.
+# Prepending ClassName with = will only match against direct class, not for
+# subclasses.
 # TODO(jacobr): cleanup and augment this list.
 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',
@@ skipping 100 matching lines @@
     'Element.innerText',
     'Element.on:wheel',
     'Element.outerText',
     'Element.removeAttributeNode',
     'Element.set:outerHTML',
     'Element.setAttributeNode',
     'Element.setAttributeNodeNS',
     'Element.webkitCreateShadowRoot',
     'Element.webkitPseudo',
     'Element.webkitShadowRoot',
-    'Event.returnValue',
+    '=Event.returnValue', # Only suppress on Event, allow for BeforeUnloadEvnt.
     'Event.srcElement',
     'EventSource.URL',
     'FontFaceSet.load',
     'FontFaceSet.ready',
     'HTMLAnchorElement.charset',
     'HTMLAnchorElement.coords',
     'HTMLAnchorElement.rev',
     'HTMLAnchorElement.shape',
     'HTMLAnchorElement.text',
     'HTMLAppletElement.*',
@@ skipping 230 matching lines @@
     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
+    def find_match(interface_id):
+      member_name = interface_id + '.' + member
       if member_name in candidates:
         return member_name
-      member_name = interface.id + '.' + member_prefix + member
+      member_name = interface_id + '.' + member_prefix + member
       if member_name in candidates:
         return member_name
-      member_name = interface.id + '.*'
+      member_name = interface_id + '.*'
       if member_name in candidates:
         return member_name
 
+    # Check direct matches first
+    match = find_match('=%s' % interface.id)
+    if match:
+      return match
+
+    for interface in self._database.Hierarchy(interface):
+      match = find_match(interface.id)
+      if match:
+        return match
+
   def GetLibraryName(self, interface):
     # Some types have attributes merged in from many other interfaces.
     if interface.id in _library_names:
       return _library_names[interface.id]
 
     # TODO(ager, blois): The conditional has been removed from indexed db,
     # so we can no longer determine the library based on the conditionals.
     if interface.id.startswith("IDB"):
       return 'indexed_db'
     if interface.id.startswith("SQL"):
@@ skipping 76 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)