Revert "Add @JSName annotation for native fields and methods."

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 527 matching lines @@
     'any set IDBObjectStore.put': _serialize_SSV,
     'any set IDBCursor.update': _serialize_SSV,
 
     # postMessage
     'any set DedicatedWorkerContext.postMessage': _serialize_SSV,
     'any set MessagePort.postMessage': _serialize_SSV,
     'SerializedScriptValue set DOMWindow.postMessage': _serialize_SSV,
     'SerializedScriptValue set Worker.postMessage': _serialize_SSV,
 
     # receiving message via MessageEvent
-    '* get MessageEvent.data':
+    'DOMObject get MessageEvent.data':
       Conversion('_convertNativeToDart_SerializedScriptValue',
                  'dynamic', 'dynamic'),
 
-    '* get History.state':
+    'DOMObject get PopStateEvent.state':
       Conversion('_convertNativeToDart_SerializedScriptValue',
                  'dynamic', 'dynamic'),
 
-    '* get PopStateEvent.state':
-      Conversion('_convertNativeToDart_SerializedScriptValue',
-                 'dynamic', 'dynamic'),
-
     # IDBAny is problematic.  Some uses are just a union of other IDB types,
     # which need no conversion..  Others include data values which require
     # serialized script value processing.
     'IDBAny get IDBCursorWithValue.value':
       Conversion('_convertNativeToDart_IDBAny', 'dynamic', 'dynamic'),
 
     # This is problematic.  The result property of IDBRequest is used for
     # all requests.  Read requests like IDBDataStore.getObject need
     # conversion, but other requests like opening a database return
     # something that does not need conversion.
     'IDBAny get IDBRequest.result':
       Conversion('_convertNativeToDart_IDBAny', 'dynamic', 'dynamic'),
 
     # "source: On getting, returns the IDBObjectStore or IDBIndex that the
     # cursor is iterating. ...".  So we should not try to convert it.
     'IDBAny get IDBCursor.source': None,
 
     # Should be either a DOMString, an Array of DOMStrings or null.
     'IDBAny get IDBObjectStore.keyPath': None,
 }
 
 def FindConversion(idl_type, direction, interface, member):
   table = dart2js_conversions
   return (table.get('%s %s %s.%s' % (idl_type, direction, interface, member)) or
-          table.get('* %s %s.%s' % (direction, interface, member)) or
           table.get('%s %s %s.*' % (idl_type, direction, interface)) or
           table.get('%s %s' % (idl_type, direction)))
   return None
 
 # ------------------------------------------------------------------------------
 
-# Annotations to be placed on native members.  The table is indexed by the IDL
+# Annotations to be placed on members.  The table is indexed by the IDL
 # interface and member name, and by IDL return or field type name.  Both are
 # used to assemble the annotations:
 #
 #   INTERFACE.MEMBER: annotations for member.
 #   +TYPE:            add annotations only if there are member annotations.
 #   TYPE:             add regardless of member annotations.
 
 dart2js_annotations = {
 
     'CanvasRenderingContext2D.createImageData':
       "@Creates('ImageData|=Object')",
 
     'CanvasRenderingContext2D.getImageData':
       "@Creates('ImageData|=Object')",
 
     'CanvasRenderingContext2D.webkitGetImageDataHD':
       "@Creates('ImageData|=Object')",
 
-    # Methods returning Window can return a local window, or a cross-frame
-    # window (=Object) that needs wrapping.
-    'DOMWindow':
-      "@Creates('LocalWindow|=Object') @Returns('LocalWindow|=Object')",
-
     'DOMWindow.openDatabase': "@Creates('Database') @Creates('DatabaseSync')",
 
-    # Cross-frame windows are EventTargets.
-    'EventTarget':
-      #"@Creates('Null') @Returns('EventTarget|=Object')",
-      "@Creates('EventTarget|=Object') @Returns('EventTarget|=Object')",
-
     'FileReader.result': "@Creates('String|ArrayBuffer|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.
@@ skipping 21 matching lines @@
     'IDBCursor.key': "@_annotation_Creates_IDBKey @_annotation_Returns_IDBKey",
 
     '+IDBRequest': "@Returns('IDBRequest') @Creates('IDBRequest')",
 
     '+IDBOpenDBRequest': "@Returns('IDBRequest') @Creates('IDBRequest')",
     '+IDBVersionChangeRequest': "@Returns('IDBRequest') @Creates('IDBRequest')",
 
 
     'MessageEvent.ports': "@Creates('=List')",
 
-    'MessageEvent.data':
-      "@_annotation_Creates_SerializedScriptValue "
-      "@_annotation_Returns_SerializedScriptValue",
-    'PopStateEvent.state':
-      "@_annotation_Creates_SerializedScriptValue "
-      "@_annotation_Returns_SerializedScriptValue",
-    'SerializedScriptValue':
-      "@_annotation_Creates_SerializedScriptValue "
-      "@_annotation_Returns_SerializedScriptValue",
-
     'SQLResultSetRowList.item': "@Creates('=Object')",
 
     'XMLHttpRequest.response':
       "@Creates('ArrayBuffer|Blob|Document|=Object|=List|String|num')",
 }
 
 def FindAnnotations(idl_type, interface_name, member_name):
   ann1 = dart2js_annotations.get("%s.%s" % (interface_name, member_name))
   if ann1:
     ann2 = dart2js_annotations.get('+' + idl_type)
@@ skipping 431 matching lines @@
     'FileList': TypeData(clazz='Interface', item_type='File',
         suppress_interface=True),
     'GamepadList': TypeData(clazz='Interface', item_type='Gamepad',
         suppress_interface=True),
     'HTMLAllCollection': TypeData(clazz='Interface', item_type='Node'),
     'HTMLCollection': TypeData(clazz='Interface', item_type='Node'),
     'MediaStreamList': TypeData(clazz='Interface',
         item_type='MediaStream', suppress_interface=True),
     'NamedNodeMap': TypeData(clazz='Interface', item_type='Node'),
     'NodeList': TypeData(clazz='Interface', item_type='Node',
-                         suppress_interface=False, dart_type='List<Node>'),
+                         suppress_interface=True),
     'SVGAnimatedLengthList': TypeData(clazz='Interface',
         item_type='SVGAnimatedLength'),
     'SVGAnimatedNumberList': TypeData(clazz='Interface',
         item_type='SVGAnimatedNumber'),
     'SVGAnimatedTransformList': TypeData(clazz='Interface',
         item_type='SVGAnimateTransformElement'),
     'SVGElementInstanceList': TypeData(clazz='Interface',
         item_type='SVGElementInstance', suppress_interface=True),
     'SourceBufferList': TypeData(clazz='Interface', item_type='SourceBuffer'),
     'SpeechGrammarList': TypeData(clazz='Interface', item_type='SpeechGrammar'),
@@ skipping 91 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)