Refine types of EventTarget

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 576 matching lines @@
   return None
 
 # ------------------------------------------------------------------------------
 
 # Annotations to be placed on native 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 annotations only if there are no 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')",
+    '-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':
+        "@Creates('Null') @Returns('EventTarget|=Object')",
+
+    # Only nodes in the DOM bubble and have target !== currentTarget.
+    'Event.target':
+        "@Creates('Node') @Returns('EventTarget|=Object')",
+
+    'MouseEvent.relatedTarget':
+        "@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')",
 
     # 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 48 matching lines @@
   ann1 = dart2js_annotations.get("%s.%s" % (interface_name, member_name))
   if ann1:
     ann2 = dart2js_annotations.get('+' + idl_type)
     if ann2:
       return ann2 + ' ' + ann1
     ann2 = dart2js_annotations.get(idl_type)
     if ann2:
       return ann2 + ' ' + ann1
     return ann1
 
+  ann2 = dart2js_annotations.get('-' + idl_type)
+  if ann2:
+    return ann2
   ann2 = dart2js_annotations.get(idl_type)
   return ann2
 
 # ------------------------------------------------------------------------------
 
 class IDLTypeInfo(object):
   def __init__(self, idl_type, data):
     self._idl_type = idl_type
     self._data = data
 
@@ skipping 525 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)