Renaming Window to WindowBase and LocalWindow to Window.

sdk/lib/html/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 re
 
 html_interface_renames = {
     'CDATASection': 'CDataSection',
     'DOMApplicationCache': 'ApplicationCache',
     'DOMCoreException': 'DomException',
     'DOMFileSystem': 'FileSystem',
     'DOMFileSystemSync': 'FileSystemSync',
     'DOMFormData': 'FormData',
     'DOMURL': 'Url',
-    'DOMWindow': 'LocalWindow',
-    'History': 'LocalHistory',
+    'DOMWindow': 'Window',
     'HTMLDocument' : 'HtmlDocument',
     'IDBAny': '_Any', # Suppressed, but needs to exist for Dartium.
     'IDBFactory': 'IdbFactory', # Manual to avoid name conflicts.
-    'Location': 'LocalLocation',
     'SVGDocument': 'SvgDocument', # Manual to avoid name conflicts.
     'SVGElement': 'SvgElement', # Manual to avoid name conflicts.
     'SVGException': 'SvgException', # Manual of avoid conflict with Exception.
     'SVGSVGElement': 'SvgSvgElement', # Manual to avoid name conflicts.
     'WebGLVertexArrayObjectOES': 'WebGLVertexArrayObject',
     'WebKitAnimation': 'Animation',
     'WebKitAnimationEvent': 'AnimationEvent',
     'WebKitBlobBuilder': 'BlobBuilder',
     'WebKitCSSKeyframeRule': 'CssKeyframeRule',
     'WebKitCSSKeyframesRule': 'CssKeyframesRule',
@@ skipping 72 matching lines @@
   'ElementTraversal.childElementCount',
   'ElementTraversal.firstElementChild',
   'ElementTraversal.lastElementChild',
   'Event.initEvent',
   'UIEvent.initUIEvent',
   'EventTarget.addEventListener',
   'EventTarget.dispatchEvent',
   'EventTarget.removeEventListener',
   'KeyboardEvent.keyIdentifier',
   'KeyboardEvent.initKeyboardEvent',
-  'LocalWindow.getComputedStyle',
+  'Window.getComputedStyle',

[sra1, 2012/12/20 02:19:18]

Move to keep sorted.

[Emily Fortuna, 2012/12/20 18:26:23]

+1

   'MouseEvent.initMouseEvent',
   'Node.appendChild',
   'Node.attributes',
   'Node.childNodes',
   'Node.firstChild',
   'Node.lastChild',
   "Node.localName",
   'Node.namespaceURI',
   'Node.removeChild',
   'Node.replaceChild',
@@ skipping 190 matching lines @@
     "Node.get:prefix",
     "Node.set:prefix",
     "Node.get:DOCUMENT_POSITION_PRECEDING",
     "Node.get:nodeValue",
     "Node.set:nodeValue",
     "Node.get:CDATA_SECTION_NODE",
     "Node.get:nodeName",
     "Node.lookupPrefix",
     "Node.get:PROCESSING_INSTRUCTION_NODE",
     'ShadowRoot.getElementsByTagNameNS',
-    "LocalWindow.blur",
-    "LocalWindow.clientInformation",
-    "LocalWindow.get:frames",
-    "LocalWindow.get:length",
-    "LocalWindow.focus",
-    "LocalWindow.prompt",
-    "LocalWindow.webkitIndexedDB",
-    "LocalWindow.webkitCancelRequestAnimationFrame",
+    "Window.blur",
+    "Window.clientInformation",
+    "Window.get:frames",
+    "Window.get:length",
+    "Window.focus",
+    "Window.prompt",
+    "Window.webkitIndexedDB",
+    "Window.webkitCancelRequestAnimationFrame",
     "WheelEvent.wheelDelta",
     "WorkerContext.webkitIndexedDB",
     ])
 
 class HtmlRenamer(object):
   def __init__(self, database):
     self._database = database
 
   def RenameInterface(self, interface):
     if interface.id in html_interface_renames:
@@ skipping 73 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)