| 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 typed_array_renames = { | 9 typed_array_renames = { |
| 10 'ArrayBuffer': 'ByteBuffer', | 10 'ArrayBuffer': 'ByteBuffer', |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 'StorageInfo.requestQuota', | 150 'StorageInfo.requestQuota', |
| 151 'WorkerContext.webkitResolveLocalFileSystemURL', | 151 'WorkerContext.webkitResolveLocalFileSystemURL', |
| 152 'WorkerContext.webkitRequestFileSystem', | 152 'WorkerContext.webkitRequestFileSystem', |
| 153 ]) | 153 ]) |
| 154 | 154 |
| 155 # Members from the standard dom that should not be exposed publicly in dart:html | 155 # Members from the standard dom that should not be exposed publicly in dart:html |
| 156 # but need to be exposed internally to implement dart:html on top of a standard | 156 # but need to be exposed internally to implement dart:html on top of a standard |
| 157 # browser. | 157 # browser. |
| 158 _private_html_members = monitored.Set('htmlrenamer._private_html_members', [ | 158 _private_html_members = monitored.Set('htmlrenamer._private_html_members', [ |
| 159 'CanvasRenderingContext2D.arc', | 159 'CanvasRenderingContext2D.arc', |
| 160 'CanvasRenderingContext2D.drawImage', | |
| 161 'CompositionEvent.initCompositionEvent', | 160 'CompositionEvent.initCompositionEvent', |
| 162 'CustomEvent.initCustomEvent', | 161 'CustomEvent.initCustomEvent', |
| 163 'DeviceOrientationEvent.initDeviceOrientationEvent', | 162 'DeviceOrientationEvent.initDeviceOrientationEvent', |
| 164 'Document.createElement', | 163 'Document.createElement', |
| 165 'Document.createElementNS', | 164 'Document.createElementNS', |
| 166 'Document.createEvent', | 165 'Document.createEvent', |
| 167 'Document.createNodeIterator', | 166 'Document.createNodeIterator', |
| 168 'Document.createRange', | 167 'Document.createRange', |
| 169 'Document.createTextNode', | 168 'Document.createTextNode', |
| 170 'Document.createTouch', | 169 'Document.createTouch', |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 'Touch.screenX', | 293 'Touch.screenX', |
| 295 'Touch.screenY', | 294 'Touch.screenY', |
| 296 'TouchEvent.initTouchEvent', | 295 'TouchEvent.initTouchEvent', |
| 297 'UIEvent.charCode', | 296 'UIEvent.charCode', |
| 298 'UIEvent.initUIEvent', | 297 'UIEvent.initUIEvent', |
| 299 'UIEvent.keyCode', | 298 'UIEvent.keyCode', |
| 300 'UIEvent.layerX', | 299 'UIEvent.layerX', |
| 301 'UIEvent.layerY', | 300 'UIEvent.layerY', |
| 302 'UIEvent.pageX', | 301 'UIEvent.pageX', |
| 303 'UIEvent.pageY', | 302 'UIEvent.pageY', |
| 304 'WheelEvent.wheelDeltaX', | |
| 305 'WheelEvent.wheelDeltaY', | |
| 306 'WheelEvent.initWebKitWheelEvent', | 303 'WheelEvent.initWebKitWheelEvent', |
| 307 'DOMWindow.getComputedStyle', | 304 'DOMWindow.getComputedStyle', |
| 308 ]) | 305 ]) |
| 309 | 306 |
| 310 # Members from the standard dom that exist in the dart:html library with | 307 # Members from the standard dom that exist in the dart:html library with |
| 311 # identical functionality but with cleaner names. | 308 # identical functionality but with cleaner names. |
| 312 renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', { | 309 renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', { |
| 310 'CanvasRenderingContext2D.drawImage': '_drawImage', |
| 313 'CSSStyleDeclaration.getPropertyValue': '_getPropertyValue', | 311 'CSSStyleDeclaration.getPropertyValue': '_getPropertyValue', |
| 314 'CSSStyleDeclaration.setProperty': '_setProperty', | 312 'CSSStyleDeclaration.setProperty': '_setProperty', |
| 315 'DirectoryEntry.getDirectory': '_getDirectory', | 313 'DirectoryEntry.getDirectory': '_getDirectory', |
| 316 'DirectoryEntry.getFile': '_getFile', | 314 'DirectoryEntry.getFile': '_getFile', |
| 317 'Document.createCDATASection': 'createCDataSection', | 315 'Document.createCDATASection': 'createCDataSection', |
| 318 'Document.defaultView': 'window', | 316 'Document.defaultView': 'window', |
| 319 'Document.querySelector': 'query', | 317 'Document.querySelector': 'query', |
| 320 'DOMURL.createObjectURL': 'createObjectUrl', | 318 'DOMURL.createObjectURL': 'createObjectUrl', |
| 321 'DOMURL.revokeObjectURL': 'revokeObjectUrl', | 319 'DOMURL.revokeObjectURL': 'revokeObjectUrl', |
| 322 'DOMWindow.clearTimeout': '_clearTimeout', | 320 'DOMWindow.clearTimeout': '_clearTimeout', |
| (...skipping 15 matching lines...) Expand all Loading... |
| 338 'Node.nextSibling': 'nextNode', | 336 'Node.nextSibling': 'nextNode', |
| 339 'Node.ownerDocument': 'document', | 337 'Node.ownerDocument': 'document', |
| 340 'Node.parentElement': 'parent', | 338 'Node.parentElement': 'parent', |
| 341 'Node.previousSibling': 'previousNode', | 339 'Node.previousSibling': 'previousNode', |
| 342 'Node.textContent': 'text', | 340 'Node.textContent': 'text', |
| 343 'RTCPeerConnection.createAnswer': '_createAnswer', | 341 'RTCPeerConnection.createAnswer': '_createAnswer', |
| 344 'RTCPeerConnection.createOffer': '_createOffer', | 342 'RTCPeerConnection.createOffer': '_createOffer', |
| 345 'StorageInfo.queryUsageAndQuota': '_queryUsageAndQuota', | 343 'StorageInfo.queryUsageAndQuota': '_queryUsageAndQuota', |
| 346 'SVGElement.className': '$dom_svgClassName', | 344 'SVGElement.className': '$dom_svgClassName', |
| 347 'SVGStopElement.offset': 'gradientOffset', | 345 'SVGStopElement.offset': 'gradientOffset', |
| 346 'WheelEvent.wheelDeltaX': '_wheelDeltaX', |
| 347 'WheelEvent.wheelDeltaY': '_wheelDeltaY', |
| 348 #'WorkerContext.webkitRequestFileSystem': '_requestFileSystem', | 348 #'WorkerContext.webkitRequestFileSystem': '_requestFileSystem', |
| 349 #'WorkerContext.webkitRequestFileSystemSync': '_requestFileSystemSync', | 349 #'WorkerContext.webkitRequestFileSystemSync': '_requestFileSystemSync', |
| 350 }) | 350 }) |
| 351 | 351 |
| 352 for member in convert_to_future_members: | 352 for member in convert_to_future_members: |
| 353 if member in renamed_html_members: | 353 if member in renamed_html_members: |
| 354 renamed_html_members[member] = '_' + renamed_html_members[member] | 354 renamed_html_members[member] = '_' + renamed_html_members[member] |
| 355 else: | 355 else: |
| 356 renamed_html_members[member] = '_' + member[member.find('.') + 1 :] | 356 renamed_html_members[member] = '_' + member[member.find('.') + 1 :] |
| 357 | 357 |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 | 760 |
| 761 # We're looking for a sequence of letters which start with capital letter | 761 # We're looking for a sequence of letters which start with capital letter |
| 762 # then a series of caps and finishes with either the end of the string or | 762 # then a series of caps and finishes with either the end of the string or |
| 763 # a capital letter. | 763 # a capital letter. |
| 764 # The [0-9] check is for names such as 2D or 3D | 764 # The [0-9] check is for names such as 2D or 3D |
| 765 # The following test cases should match as: | 765 # The following test cases should match as: |
| 766 # WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue | 766 # WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue |
| 767 # XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change) | 767 # XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change) |
| 768 # IFrameElement: (I)()(F)rameElement (no change) | 768 # IFrameElement: (I)()(F)rameElement (no change) |
| 769 return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name) | 769 return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name) |
| OLD | NEW |