Index: tools/dom/scripts/htmlrenamer.py |
diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py |
index 3d9f5a0573772d3dabf9be3e98fad3c83406536e..59f93cab17a2aee8eafcbbb944a59459af338e54 100644 |
--- a/tools/dom/scripts/htmlrenamer.py |
+++ b/tools/dom/scripts/htmlrenamer.py |
@@ -161,8 +161,6 @@ convert_to_future_members = monitored.Set( |
# $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 |
@@ -233,6 +231,8 @@ private_html_members = monitored.Set('htmlrenamer.private_html_members', [ |
'Element.innerHTML', |
'Element.querySelectorAll', |
'Event.initEvent', |
+ 'EventTarget.addEventListener', |
+ 'EventTarget.removeEventListener', |
'Geolocation.clearWatch', |
'Geolocation.getCurrentPosition', |
'Geolocation.watchPosition', |
@@ -767,8 +767,9 @@ _library_ids = monitored.Dict('htmlrenamer._library_names', { |
}) |
class HtmlRenamer(object): |
- def __init__(self, database): |
+ def __init__(self, database, metadata): |
self._database = database |
+ self._metadata = metadata |
def RenameInterface(self, interface): |
if 'Callback' in interface.ext_attrs: |
@@ -835,6 +836,11 @@ class HtmlRenamer(object): |
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): |