| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a |
| 4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. |
| 5 import logging | 5 import logging |
| 6 import monitored | 6 import monitored |
| 7 import re | 7 import re |
| 8 | 8 |
| 9 html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', { | 9 html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', { |
| 10 'CDATASection': 'CDataSection', | 10 'CDATASection': 'CDataSection', |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 'UIEvent.initUIEvent', | 173 'UIEvent.initUIEvent', |
| 174 'UIEvent.keyCode', | 174 'UIEvent.keyCode', |
| 175 'WheelEvent.wheelDeltaX', | 175 'WheelEvent.wheelDeltaX', |
| 176 'WheelEvent.wheelDeltaY', | 176 'WheelEvent.wheelDeltaY', |
| 177 'WheelEvent.initWebKitWheelEvent', | 177 'WheelEvent.initWebKitWheelEvent', |
| 178 'DOMWindow.getComputedStyle', | 178 'DOMWindow.getComputedStyle', |
| 179 ]) | 179 ]) |
| 180 | 180 |
| 181 # Members from the standard dom that exist in the dart:html library with | 181 # Members from the standard dom that exist in the dart:html library with |
| 182 # identical functionality but with cleaner names. | 182 # identical functionality but with cleaner names. |
| 183 _renamed_html_members = monitored.Dict('htmlrenamer._renamed_html_members', { | 183 renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', { |
| 184 'Document.createCDATASection': 'createCDataSection', |
| 185 'Document.defaultView': 'window', |
| 184 'DOMURL.createObjectURL': 'createObjectUrl', | 186 'DOMURL.createObjectURL': 'createObjectUrl', |
| 185 'DOMURL.revokeObjectURL': 'revokeObjectUrl', | 187 'DOMURL.revokeObjectURL': 'revokeObjectUrl', |
| 186 'DOMWindow.webkitConvertPointFromNodeToPage': 'convertPointFromNodeToPage', | 188 'DOMWindow.webkitConvertPointFromNodeToPage': 'convertPointFromNodeToPage', |
| 187 'DOMWindow.webkitConvertPointFromPageToNode': 'convertPointFromPageToNode', | 189 'DOMWindow.webkitConvertPointFromPageToNode': 'convertPointFromPageToNode', |
| 188 'DOMWindow.webkitNotifications': 'notifications', | 190 'DOMWindow.webkitNotifications': 'notifications', |
| 189 'DOMWindow.webkitRequestFileSystem': 'requestFileSystem', | 191 'DOMWindow.webkitRequestFileSystem': 'requestFileSystem', |
| 190 'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl', | 192 'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl', |
| 191 'DOMWindow.webkitRequestFileSystem': 'requestFileSystem', | 193 'DOMWindow.webkitRequestFileSystem': 'requestFileSystem', |
| 192 'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl', | 194 'DOMWindow.webkitResolveLocalFileSystemURL': 'resolveLocalFileSystemUrl', |
| 193 'Document.createCDATASection': 'createCDataSection', | |
| 194 'Document.defaultView': 'window', | |
| 195 'Element.scrollIntoViewIfNeeded': 'scrollIntoView', | 195 'Element.scrollIntoViewIfNeeded': 'scrollIntoView', |
| 196 'Element.webkitCreateShadowRoot': 'createShadowRoot', | 196 'Element.webkitCreateShadowRoot': 'createShadowRoot', |
| 197 'Element.webkitMatchesSelector' : 'matches', | 197 'Element.webkitMatchesSelector' : 'matches', |
| 198 'Navigator.webkitGetUserMedia': '_getUserMedia', | 198 'Navigator.webkitGetUserMedia': '_getUserMedia', |
| 199 'Node.cloneNode': 'clone', | 199 'Node.cloneNode': 'clone', |
| 200 'Node.nextSibling': 'nextNode', | 200 'Node.nextSibling': 'nextNode', |
| 201 'Node.ownerDocument': 'document', | 201 'Node.ownerDocument': 'document', |
| 202 'Node.parentElement': 'parent', | 202 'Node.parentElement': 'parent', |
| 203 'Node.previousSibling': 'previousNode', | 203 'Node.previousSibling': 'previousNode', |
| 204 'Node.textContent': 'text', | 204 'Node.textContent': 'text', |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 """ | 502 """ |
| 503 interface = self._database.GetInterface(interface_name) | 503 interface = self._database.GetInterface(interface_name) |
| 504 | 504 |
| 505 if self.ShouldSuppressMember(interface, member, member_prefix): | 505 if self.ShouldSuppressMember(interface, member, member_prefix): |
| 506 return None | 506 return None |
| 507 | 507 |
| 508 if 'CheckSecurityForNode' in member_node.ext_attrs: | 508 if 'CheckSecurityForNode' in member_node.ext_attrs: |
| 509 return None | 509 return None |
| 510 | 510 |
| 511 name = self._FindMatch(interface, member, member_prefix, | 511 name = self._FindMatch(interface, member, member_prefix, |
| 512 _renamed_html_members) | 512 renamed_html_members) |
| 513 | 513 |
| 514 target_name = _renamed_html_members[name] if name else member | 514 target_name = renamed_html_members[name] if name else member |
| 515 if self._FindMatch(interface, member, member_prefix, _private_html_members): | 515 if self._FindMatch(interface, member, member_prefix, _private_html_members): |
| 516 if not target_name.startswith('$dom_'): # e.g. $dom_svgClassName | 516 if not target_name.startswith('$dom_'): # e.g. $dom_svgClassName |
| 517 target_name = '$dom_' + target_name | 517 target_name = '$dom_' + target_name |
| 518 | 518 |
| 519 if not name and target_name.startswith('webkit'): |
| 520 target_name = member[len('webkit'):] |
| 521 target_name = target_name[:1].lower() + target_name[1:] |
| 522 |
| 519 if dartify_name: | 523 if dartify_name: |
| 520 target_name = self._DartifyMemberName(target_name) | 524 target_name = self._DartifyMemberName(target_name) |
| 521 return target_name | 525 return target_name |
| 522 | 526 |
| 523 def ShouldSuppressMember(self, interface, member, member_prefix=''): | 527 def ShouldSuppressMember(self, interface, member, member_prefix=''): |
| 524 """ Returns true if the member should be suppressed.""" | 528 """ Returns true if the member should be suppressed.""" |
| 525 if self._FindMatch(interface, member, member_prefix, | 529 if self._FindMatch(interface, member, member_prefix, |
| 526 _removed_html_members): | 530 _removed_html_members): |
| 527 return True | 531 return True |
| 528 return False | 532 return False |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 | 578 |
| 575 # We're looking for a sequence of letters which start with capital letter | 579 # We're looking for a sequence of letters which start with capital letter |
| 576 # then a series of caps and finishes with either the end of the string or | 580 # then a series of caps and finishes with either the end of the string or |
| 577 # a capital letter. | 581 # a capital letter. |
| 578 # The [0-9] check is for names such as 2D or 3D | 582 # The [0-9] check is for names such as 2D or 3D |
| 579 # The following test cases should match as: | 583 # The following test cases should match as: |
| 580 # WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue | 584 # WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue |
| 581 # XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change) | 585 # XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change) |
| 582 # IFrameElement: (I)()(F)rameElement (no change) | 586 # IFrameElement: (I)()(F)rameElement (no change) |
| 583 return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name) | 587 return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name) |
| OLD | NEW |