Fixing the BeforeUnloadEvent

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 576 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',

[Emily Fortuna, 2013/10/31 22:03:42]

accidental?

[blois, 2013/10/31 22:09:21]

Nope- need to suppress returnValue on Event, but not on BeforeUnloadEvent, so
added this syntax. Not sure if it's the best prefix though.

See code below where support for it was added.

[vsm, 2013/10/31 22:15:41]

Maybe '=Event' - I think the JS magic function has similar for exact type match.

Can you add a comment here as to what it means either way?

[blois, 2013/10/31 22:36:09]

Done.

     '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)