Renaming Window to WindowBase and LocalWindow to Window.

sdk/lib/html/scripts/generator.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 for systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import re
@@ skipping 490 matching lines @@
 #
 
 _serialize_SSV = Conversion('convertDartToNative_SerializedScriptValue',
                            'dynamic', 'dynamic')
 
 dart2js_conversions = {
     # Wrap non-local Windows.  We need to check EventTarget (the base type)
     # as well.  Note, there are no functions that take a non-local Window
     # as a parameter / setter.
     'DOMWindow get':
-      Conversion('_convertNativeToDart_Window', 'dynamic', 'Window'),
+      Conversion('_convertNativeToDart_Window', 'dynamic', 'WindowBase'),
     'EventTarget get':
       Conversion('_convertNativeToDart_EventTarget', 'dynamic',
                  'EventTarget'),
     'EventTarget set':
       Conversion('_convertDartToNative_EventTarget', 'EventTarget',
                  'dynamic'),
 
     'IDBKey get':
       Conversion('_convertNativeToDart_IDBKey', 'dynamic', 'dynamic'),
     'IDBKey set':
@@ skipping 90 matching lines @@
       "@Creates('String|CanvasGradient|CanvasPattern') "
       "@Returns('String|CanvasGradient|CanvasPattern')",
 
     'CanvasRenderingContext2D.strokeStyle':
       "@Creates('String|CanvasGradient|CanvasPattern') "
       "@Returns('String|CanvasGradient|CanvasPattern')",
 
     # Methods returning Window can return a local window, or a cross-frame
     # window (=Object) that needs wrapping.
     'DOMWindow':
-      "@Creates('LocalWindow|=Object') @Returns('LocalWindow|=Object')",
+      "@Creates('Window|=Object') @Returns('Window|=Object')",
 
     'DOMWindow.openDatabase': "@Creates('Database') @Creates('DatabaseSync')",
 
     # Cross-frame windows are EventTargets.
     '-EventTarget':
       "@Creates('EventTarget|=Object') @Returns('EventTarget|=Object')",
 
     # To be in callback with the browser-created Event, we had to have called
     # addEventListener on the target, so we avoid
     'Event.currentTarget':
@@ skipping 616 matching lines @@
                                   self)
 
     if type_data.clazz == 'SVGTearOff':
       dart_interface_name = self._renamer.RenameInterface(
           self._database.GetInterface(type_name))
       return SVGTearOffIDLTypeInfo(
           type_name, type_data, dart_interface_name, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)