Reapply 12799.

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
+from htmlrenamer import html_interface_renames
 
 _pure_interfaces = set([
     # TODO(sra): DOMStringMap should be a class implementing Map<String,String>.
     'DOMStringMap',
     'ElementTimeControl',
     'ElementTraversal',
     'MediaQueryListListener',
     'NodeSelector',
     'SVGExternalResourcesRequired',
     'SVGFilterPrimitiveStandardAttributes',
@@ skipping 780 matching lines @@
   def argument_expression(self, name, interface_name):
     return name if interface_name.endswith('List') else '%s->propertyReference()' % name
 
 
 class TypeData(object):
   def __init__(self, clazz, dart_type=None, native_type=None,
                custom_to_dart=None, custom_to_native=None,
                conversion_includes=None,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute',
-               requires_v8_scope=False):
+               requires_v8_scope=False, suppress_public_interface=False):
+    """Constructor. 
+    Arguments:
+    - suppress_public_interface is True if we are converting a DOM type to a
+        built-in Dart type in which case we do not want to generate the new
+        interface in the library (FooList -> List<Foo> for example) but we still
+        generate the underlying implementation classes."""
     self.clazz = clazz
     self.dart_type = dart_type
     self.native_type = native_type
     self.custom_to_dart = custom_to_dart
     self.custom_to_native = custom_to_native
     self.conversion_includes = conversion_includes
     self.webcore_getter_name = webcore_getter_name
     self.webcore_setter_name = webcore_setter_name
     self.requires_v8_scope = requires_v8_scope
+    self.suppress_public_interface = suppress_public_interface
 
 
 _idl_type_registry = {
     'boolean': TypeData(clazz='Primitive', dart_type='bool', native_type='bool',
                         webcore_getter_name='hasAttribute',
                         webcore_setter_name='setBooleanAttribute'),
     'byte': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'octet': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'short': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'unsigned short': TypeData(clazz='Primitive', dart_type='int',
@@ skipping 33 matching lines @@
     # the documentation, the user is made aware that only a limited subset of
     # serializable types are actually permitted.
     'SerializedScriptValue': TypeData(clazz='Primitive', dart_type='Dynamic'),
     # TODO(sra): Flags is really a dictionary: {create:bool, exclusive:bool}
     # http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-flags-interface
     'WebKitFlags': TypeData(clazz='Primitive', dart_type='Object'),
 
     'sequence': TypeData(clazz='Primitive', dart_type='List'),
     'void': TypeData(clazz='Primitive', dart_type='void'),
 
+    'ClientRectList': TypeData(clazz='Interface', dart_type='List<ClientRect>',
+        custom_to_native=True, suppress_public_interface=True),
+    'CSSRuleList': TypeData(clazz='Interface', dart_type='List<CSSRule>',
+        custom_to_native=True, suppress_public_interface=True),
+    'CSSValueList': TypeData(clazz='Interface', dart_type='List<CSSValue>',
+        custom_to_native=True, suppress_public_interface=True),
     'CSSRule': TypeData(clazz='Interface', conversion_includes=['CSSImportRule']),
     'DOMException': TypeData(clazz='Interface', native_type='DOMCoreException'),
     'DOMStringList': TypeData(clazz='Interface', dart_type='List<String>', custom_to_native=True),
     'DOMStringMap': TypeData(clazz='Interface', dart_type='Map<String, String>'),
     'DOMWindow': TypeData(clazz='Interface', custom_to_dart=True),
     'Element': TypeData(clazz='Interface', custom_to_dart=True),
+    'EntryArray': TypeData(clazz='Interface', dart_type='List<EntryArray>',
+        custom_to_native=True, suppress_public_interface=True),
+    'EntryArraySync': TypeData(clazz='Interface',
+        dart_type='List<EntryArraySync>', custom_to_native=True,
+        suppress_public_interface=True),
     'EventListener': TypeData(clazz='Interface', custom_to_native=True),
     'EventTarget': TypeData(clazz='Interface', custom_to_native=True),
+    'FileList': TypeData(clazz='Interface', dart_type='List<File>',
+        custom_to_native=True, suppress_public_interface=True),
+    'GamepadList': TypeData(clazz='Interface', dart_type='List<Gamepad>',
+        custom_to_native=True, suppress_public_interface=True),
     'HTMLElement': TypeData(clazz='Interface', custom_to_dart=True),
     'IDBAny': TypeData(clazz='Interface', dart_type='Dynamic', custom_to_native=True),
     'IDBKey': TypeData(clazz='Interface', dart_type='Dynamic', custom_to_native=True),
+    'MediaStreamList': TypeData(clazz='Interface',
+        dart_type='List<MediaStream>', custom_to_native=True,
+        suppress_public_interface=True),
     'MutationRecordArray': TypeData(clazz='Interface',  # C++ pass by pointer.
-                                    native_type='MutationRecordArray',
-                                    dart_type='List<MutationRecord>'),
+        native_type='MutationRecordArray', dart_type='List<MutationRecord>'),
     'StyleSheet': TypeData(clazz='Interface', conversion_includes=['CSSStyleSheet']),
     'SVGElement': TypeData(clazz='Interface', custom_to_dart=True),
+    'SVGElementInstanceList': TypeData(clazz='Interface',
+        dart_type='List<SVGElementInstance>', custom_to_native=True,
+        suppress_public_interface=True),
+    'SpeechInputResultList': TypeData(clazz='Interface',
+        dart_type='List<SpeechInputResult>', custom_to_native=True,
+        suppress_public_interface=True),
+    'SpeechRecognitionResultList': TypeData(clazz='Interface',
+        dart_type='List<SpeechRecognitionResult>', custom_to_native=True,
+        suppress_public_interface=True),
+    'StyleSheetList': TypeData(clazz='Interface',
+        dart_type='List<StyleSheet>', custom_to_native=True,
+        suppress_public_interface=True),
 
     'SVGAngle': TypeData(clazz='SVGTearOff'),
     'SVGLength': TypeData(clazz='SVGTearOff'),
     'SVGLengthList': TypeData(clazz='SVGTearOff'),
     'SVGMatrix': TypeData(clazz='SVGTearOff'),
     'SVGNumber': TypeData(clazz='SVGTearOff', native_type='SVGPropertyTearOff<float>'),
     'SVGNumberList': TypeData(clazz='SVGTearOff'),
     'SVGPathSegList': TypeData(clazz='SVGTearOff', native_type='SVGPathSegListPropertyTearOff'),
     'SVGPoint': TypeData(clazz='SVGTearOff', native_type='SVGPropertyTearOff<FloatPoint>'),
     'SVGPointList': TypeData(clazz='SVGTearOff'),
     'SVGPreserveAspectRatio': TypeData(clazz='SVGTearOff'),
     'SVGRect': TypeData(clazz='SVGTearOff', native_type='SVGPropertyTearOff<FloatRect>'),
     'SVGStringList': TypeData(clazz='SVGTearOff', native_type='SVGStaticListPropertyTearOff<SVGStringList>'),
     'SVGTransform': TypeData(clazz='SVGTearOff'),
     'SVGTransformList': TypeData(clazz='SVGTearOff', native_type='SVGTransformListPropertyTearOff'),
 }
 
+# A list constructed of DOM types that are converted to built-in dart types
+# (like Lists) and therefore whose actual interface generation should be
+# suppressed. (For type information, we still generate the implementations
+# though, so these types should not be suppressed entirely.)
+nativified_classes = {}
+for key in _idl_type_registry:
+  value = _idl_type_registry[key]
+  if value.suppress_public_interface:
+    nativified_classes[value.dart_type] = key
+    html_interface_renames[key] = value.dart_type

[Emily Fortuna, 2012/09/24 20:19:52]

This line is the one addition from the previous CL. What happened was during one
of the many rewrites of this CL, this functionality got dropped -- listing items
in the _idl_type_registry will rename the interface itself, but it does not
rename other occurrences of the of the interface elsewhere in the file (naming
the particular class in the "extends" portion of a class declaration like here:
class Foo extends List<Foo> {}
What went in in the previous CL was "class Foo extends FooList {}"

+
 _svg_supplemental_includes = [
     '"SVGAnimatedPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGStaticListPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGTransformListPropertyTearOff.h"',
     '"SVGPathSegListPropertyTearOff.h"',
 ]
 
 class TypeRegistry(object):
@@ skipping 22 matching lines @@
     if match:
       if type_name == 'DOMString[]':
         return DOMStringArrayTypeInfo(TypeData('Sequence'), self.TypeInfo('DOMString'))
       item_info = self.TypeInfo(match.group(1) or match.group(2))
       return SequenceIDLTypeInfo(type_name, TypeData('Sequence'), item_info)
     if not type_name in _idl_type_registry:
       return InterfaceIDLTypeInfo(type_name, TypeData('Interface'))
     type_data = _idl_type_registry.get(type_name)
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)