Fixes for Blink roll.

tools/dom/scripts/dartmetadata.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.
 
 """This module provides shared functionality to provide Dart metadata for
 DOM APIs.
 """
 
 import copy
@@ skipping 42 matching lines @@
 
     'CanvasRenderingContext2D.strokeStyle': [
       "@Creates('String|CanvasGradient|CanvasPattern')",
       "@Returns('String|CanvasGradient|CanvasPattern')",
     ],
 
     'CustomEvent.detail': [
       "@Creates('Null')",
     ],
 
-    # Normally DOMWindow is nevernull, but starting from a <template> element in
+    # Normally Window is nevernull, but starting from a <template> element in
     # JavaScript, this will be null:
     #     template.content.ownerDocument.defaultView
     'Document.window': [
       "@Creates('Window|=Object|Null')",
       "@Returns('Window|=Object|Null')",
     ],
 
     # Methods returning Window can return a local window, or a cross-frame
     # window (=Object) that needs wrapping.
-    'DOMWindow': [
+    'Window': [
       "@Creates('Window|=Object')",
       "@Returns('Window|=Object')",
     ],
 
-    'DOMWindow.openDatabase': [
+    'Window.openDatabase': [
       "@Creates('SqlDatabase')",
     ],
 
-    'DOMWindow.showModalDialog': [
+    'Window.showModalDialog': [
       "@Creates('Null')",
     ],
 
     # To be in callback with the browser-created Event, we had to have called
     # addEventListener on the target, so we avoid
     'Event.currentTarget': [
       "@Creates('Null')",
       "@Returns('EventTarget|=Object')",
     ],
 
@@ skipping 289 matching lines @@
   'DatabaseSync': _web_sql_annotations,
   'DOMApplicationCache': [
     "@SupportedBrowser(SupportedBrowser.CHROME)",
     "@SupportedBrowser(SupportedBrowser.FIREFOX)",
     "@SupportedBrowser(SupportedBrowser.IE, '10')",
     "@SupportedBrowser(SupportedBrowser.OPERA)",
     "@SupportedBrowser(SupportedBrowser.SAFARI)",
   ],
   'DOMFileSystem': _file_system_annotations,
   'DOMFileSystemSync': _file_system_annotations,
-  'DOMPoint': _webkit_experimental_annotations,
-  'DOMWindow.webkitConvertPointFromNodeToPage': _webkit_experimental_annotations,
-  'DOMWindow.webkitConvertPointFromPageToNode': _webkit_experimental_annotations,
-  'DOMWindow.indexedDB': _indexed_db_annotations,
-  'DOMWindow.openDatabase': _web_sql_annotations,
-  'DOMWindow.performance': _performance_annotations,
-  'DOMWindow.webkitNotifications': _webkit_experimental_annotations,
-  'DOMWindow.webkitRequestFileSystem': _file_system_annotations,
-  'DOMWindow.webkitResolveLocalFileSystemURL': _file_system_annotations,
+  'WebKitPoint': _webkit_experimental_annotations,
+  'Window.webkitConvertPointFromNodeToPage': _webkit_experimental_annotations,
+  'Window.webkitConvertPointFromPageToNode': _webkit_experimental_annotations,
+  'Window.indexedDB': _indexed_db_annotations,
+  'Window.openDatabase': _web_sql_annotations,
+  'Window.performance': _performance_annotations,
+  'Window.webkitNotifications': _webkit_experimental_annotations,
+  'Window.webkitRequestFileSystem': _file_system_annotations,
+  'Window.webkitResolveLocalFileSystemURL': _file_system_annotations,
   'Element.ontransitionend': _all_but_ie9_annotations,
   # Placeholder to add experimental flag, implementation for this is
   # pending in a separate CL.
   'Element.webkitMatchesSelector': ['@Experimental()'],
   'Element.webkitCreateShadowRoot': [
     "@SupportedBrowser(SupportedBrowser.CHROME, '25')",
     "@Experimental()",
   ],
   'Event.clipboardData': _webkit_experimental_annotations,
   'FormData': _all_but_ie9_annotations,
@@ skipping 341 matching lines @@
       pass
     else:
       _logger.warn('Unknown support_level - %s:%s' % (interface_id, member_id))
 
     return annotations
 
   def Flush(self):
     json_file = open(self._api_status_path, 'w+')
     json.dump(self._types, json_file, indent=2, separators=(',', ': '), sort_keys=True)
     json_file.close()