Renaming Window to WindowBase and LocalWindow to Window.

sdk/lib/html/scripts/htmldartgenerator.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 the system to generate
 dart:html APIs from the IDL database."""
 
 from generator import AnalyzeOperation, ConstantOutputOrder, \
     DartDomNameOfAttribute, FindMatchingAttribute, IsDartCollectionType, \
     IsPureInterface, TypeOrNothing
 
 # Types that are accessible cross-frame in a limited fashion.
-# In these cases, the base type (e.g., Window) provides restricted access
-# while the subtype (e.g., LocalWindow) provides full access to the
+# In these cases, the base type (e.g., WindowBase) provides restricted access
+# while the subtype (e.g., Window) provides full access to the
 # corresponding objects if there are from the same frame.
 _secure_base_types = {
-  'LocalWindow': 'Window',
-  'LocalLocation': 'Location',
-  'LocalHistory': 'History',
+  'Window': 'WindowBase',
+  'Location': 'LocationBase',
+  'History': 'HistoryBase',
 }
 
 class HtmlDartGenerator(object):
   def __init__(self, interface, options):
     self._database = options.database
     self._interface = interface
     self._type_registry = options.type_registry
     self._interface_type_info = self._type_registry.TypeInfo(self._interface.id)
     self._renamer = options.renamer
 
@@ skipping 265 matching lines @@
 
   def SecureOutputType(self, type_name, is_dart_type=False):
     """ Converts the type name to the secure type name for return types.
     """
     if is_dart_type:
       dart_name = type_name
     else:
       dart_name = self._DartType(type_name)
     # We only need to secure Window.  Only local History and Location are
     # returned in generated code.
-    assert(dart_name != 'History' and dart_name != 'Location')
-    if dart_name == 'LocalWindow':
+    assert(dart_name != 'HistoryBase' and dart_name != 'LocationBase')
+    if dart_name == 'Window':
       return _secure_base_types[dart_name]
     return dart_name
 
   def SecureBaseName(self, type_name):
     if type_name in _secure_base_types:
       return _secure_base_types[type_name]
 
   def _TransitiveSecondaryParents(self, interface):
     """Returns a list of all non-primary parents.
 
@@ skipping 22 matching lines @@
         walk(interface.parents)
       else:
         walk(interface.parents[1:])
     return result
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)
 
   def _IsPrivate(self, name):
     return name.startswith('_')