Patchable version of 12929005

tools/dom/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 json
@@ skipping 61 matching lines @@
 #
 _dart_attribute_renames = monitored.Dict('generator._dart_attribute_renames', {
     'default': 'defaultValue',
 })
 
 #
 # Interface version of the DOM needs to delegate typed array constructors to a
 # factory provider.
 #
 interface_factories = monitored.Dict('generator.interface_factories', {
-    'Float32Array': '_TypedArrayFactoryProvider',
-    'Float64Array': '_TypedArrayFactoryProvider',
-    'Int8Array': '_TypedArrayFactoryProvider',
-    'Int16Array': '_TypedArrayFactoryProvider',
-    'Int32Array': '_TypedArrayFactoryProvider',
-    'Uint8Array': '_TypedArrayFactoryProvider',
-    'Uint8ClampedArray': '_TypedArrayFactoryProvider',
-    'Uint16Array': '_TypedArrayFactoryProvider',
-    'Uint32Array': '_TypedArrayFactoryProvider',
+    'Float32List': '_TypedArrayFactoryProvider',
+    'Float64List': '_TypedArrayFactoryProvider',
+    'Int8List': '_TypedArrayFactoryProvider',
+    'Int16List': '_TypedArrayFactoryProvider',
+    'Int32List': '_TypedArrayFactoryProvider',
+    'Uint8List': '_TypedArrayFactoryProvider',
+    'Uint8ClampedList': '_TypedArrayFactoryProvider',
+    'Uint16List': '_TypedArrayFactoryProvider',
+    'Uint32List': '_TypedArrayFactoryProvider',
 })
 
 #
 # Custom native specs for the dart2js dom.
 #
 _dart2js_dom_custom_native_specs = monitored.Dict(
       'generator._dart2js_dom_custom_native_specs', {
     # Decorate the singleton Console object, if present (workers do not have a
     # console).
     'Console': "=(typeof console == 'undefined' ? {} : console)",
@@ skipping 289 matching lines @@
   def _ConstructorFullName(self, rename_type):
     if self.constructor_name:
       return rename_type(self.type_name) + '.' + self.constructor_name
     else:
       # TODO(antonm): temporary ugly hack.
       # While in transition phase we allow both DOM's ArrayBuffer
       # and dart:typeddata's ByteBuffer for IDLs' ArrayBuffers,
       # hence ArrayBuffer is mapped to dynamic in arguments and return
       # values.  To compensate for that when generating ArrayBuffer itself,
       # we need to lie a bit:
-      if self.type_name == 'ArrayBuffer': return 'ArrayBuffer'
+      if self.type_name == 'ArrayBuffer': return 'ByteBuffer'
       return rename_type(self.type_name)
 
 def ConstantOutputOrder(a, b):
   """Canonical output ordering for constants."""
   return cmp(a.id, b.id)
 
 
 def _FormatNameList(names):
   """Returns JavaScript array literal expression with one name per line."""
   #names = sorted(names)
@@ skipping 136 matching lines @@
 # used to assemble the annotations:
 #
 #   INTERFACE.MEMBER: annotations for member.
 #   +TYPE:            add annotations only if there are member annotations.
 #   -TYPE:            add annotations only if there are no member annotations.
 #   TYPE:             add regardless of member annotations.
 
 dart2js_annotations = monitored.Dict('generator.dart2js_annotations', {
 
     'ArrayBuffer': [
-      "@Creates('ArrayBuffer')",
-      "@Returns('ArrayBuffer|Null')",
+      "@Creates('ByteBuffer')",
+      "@Returns('ByteBuffer|Null')",
     ],
 
     'ArrayBufferView': [
-      "@Creates('ArrayBufferView')",
-      "@Returns('ArrayBufferView|Null')",
+      "@Creates('TypedData')",
+      "@Returns('TypedData|Null')",
     ],
 
     'CanvasRenderingContext2D.createImageData': [
       "@Creates('ImageData|=Object')",
     ],
 
     'CanvasRenderingContext2D.getImageData': [
       "@Creates('ImageData|=Object')",
     ],
 
@@ skipping 40 matching lines @@
       "@Creates('Node')",
       "@Returns('EventTarget|=Object')",
     ],
 
     # Touch targets are Elements in a Document, or the Document.
     'Touch.target': [
       "@Creates('Element|Document')",
       "@Returns('Element|Document')",
     ],
 
-    'FileReader.result': ["@Creates('String|ArrayBuffer|Null')"],
+    'FileReader.result': ["@Creates('String|ByteBuffer|Null')"],
 
     # Rather than have the result of an IDBRequest as a union over all possible
     # results, we mark the result as instantiating any classes, and mark
     # each operation with the classes that it could cause to be asynchronously
     # instantiated.
     'IDBRequest.result': ["@Creates('Null')"],
 
     # The source is usually a participant in the operation that generated the
     # IDBRequest.
     'IDBRequest.source':  ["@Creates('Null')"],
@@ skipping 48 matching lines @@
     'SerializedScriptValue': [
       "@annotation_Creates_SerializedScriptValue",
       "@annotation_Returns_SerializedScriptValue",
     ],
 
     'SQLResultSetRowList.item': ["@Creates('=Object')"],
 
     'WebGLRenderingContext.getParameter': [
       # Taken from http://www.khronos.org/registry/webgl/specs/latest/
       # Section 5.14.3 Setting and getting state
-      "@Creates('Null|num|String|bool|=List|Float32Array|Int32Array|Uint32Array"
+      "@Creates('Null|num|String|bool|=List|Float32List|Int32List|Uint32List"
                 "|WebGLFramebuffer|WebGLRenderbuffer|WebGLTexture')",
-      "@Returns('Null|num|String|bool|=List|Float32Array|Int32Array|Uint32Array"
+      "@Returns('Null|num|String|bool|=List|Float32List|Int32List|Uint32List"
                 "|WebGLFramebuffer|WebGLRenderbuffer|WebGLTexture')",
     ],
 
     'XMLHttpRequest.response': [
-      "@Creates('ArrayBuffer|Blob|Document|=Object|=List|String|num')",
+      "@Creates('ByteBuffer|Blob|Document|=Object|=List|String|num')",
     ],
 })
 
 _indexed_db_annotations = [
   "@SupportedBrowser(SupportedBrowser.CHROME)",
   "@SupportedBrowser(SupportedBrowser.FIREFOX, '15')",
   "@SupportedBrowser(SupportedBrowser.IE, '10')",
   "@Experimental",
 ]
 
@@ skipping 854 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)