| Index: tools/dom/scripts/htmlrenamer.py
|
| diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
|
| index 125dbc845d8df109ed9ce1373bb4175fb1dd27de..0db0feea3acf0167a71bc3c5c74fc561e536f187 100644
|
| --- a/tools/dom/scripts/htmlrenamer.py
|
| +++ b/tools/dom/scripts/htmlrenamer.py
|
| @@ -474,8 +474,6 @@ for member in convert_to_future_members:
|
| # 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
|
| @@ -596,7 +594,7 @@ removed_html_members = monitored.Set('htmlrenamer.removed_html_members', [
|
| 'Element.webkitCreateShadowRoot',
|
| 'Element.webkitPseudo',
|
| 'Element.webkitShadowRoot',
|
| - '=Event.returnValue', # Only suppress on Event, allow for BeforeUnloadEvnt.
|
| + 'Event.returnValue',
|
| 'Event.srcElement',
|
| 'EventSource.URL',
|
| 'FontFaceSet.load',
|
| @@ -847,27 +845,17 @@ class HtmlRenamer(object):
|
| return True
|
|
|
| def _FindMatch(self, interface, member, member_prefix, candidates):
|
| - def find_match(interface_id):
|
| - member_name = interface_id + '.' + member
|
| + for interface in self._database.Hierarchy(interface):
|
| + 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:
|
|
|