Remove EventListener attributes from Dart DOM API.

lib/dom/scripts/dartgenerator.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 generates Dart APIs from the IDL database."""
 
 import emitter
 import idlnode
 import logging
@@ skipping 308 matching lines @@
       super_interface = None
       super_name = interface.id
 
       if super_name in super_map:
         super_name = super_map[super_name]
 
       if (super_database is not None and
           super_database.HasInterface(super_name)):
         super_interface = super_name
 
+      # Create fake EventTarget parent interface for interfaces that have
+      # 'EventTarget' extended attribute.
+      class EventTargetParentInterface():
+        def __init__(self):
+          self.type = database.GetInterface('EventTarget')
+          self.annotations = ['WebKit']
+
+      if 'EventTarget' in interface.ext_attrs:
+        interface.parents.append(EventTargetParentInterface())

[sra1, 2012/04/11 20:23:05]

We should really append an IDLParentInterface, otherwise anything that does a
type test (e.g. printing) will not work properly.

Put a print in IDLParentInterface's constructor to see the shape of list you
need to pass in.

[podivilov, 2012/04/12 14:37:41]

Done.

+
       interface_name = interface.id
       auxiliary_file = self._auxiliary_files.get(interface_name)
       if auxiliary_file is not None:
         _logger.info('Skipping %s because %s exists' % (
             interface_name, auxiliary_file))
         continue
 
       info = RecognizeCallback(interface)
       if info:
         for system in self._systems:
           system.ProcessCallback(interface, info)
       else:
         if 'Callback' in interface.ext_attrs:
           _logger.info('Malformed callback: %s' % interface.id)
         self._ProcessInterface(interface, super_interface,
                                source_filter, common_prefix)
 
     # Libraries
     if lib_dir:
       for system in self._systems:
         system.GenerateLibraries(lib_dir)
 
     for system in self._systems:
       system.Finish()
 
-
   def _PreOrderInterfaces(self, interfaces):
     """Returns the interfaces in pre-order, i.e. parents first."""
     seen = set()
     ordered = []
     def visit(interface):
       if interface.id in seen:
         return
       seen.add(interface.id)
       for parent in interface.parents:
         if IsDartCollectionType(parent.type.id):
@@ skipping 22 matching lines @@
     generators = filter(None, generators)
 
     for generator in generators:
       generator.StartInterface()
 
     for const in sorted(interface.constants, ConstantOutputOrder):
       for generator in generators:
         generator.AddConstant(const)
 
     attributes = [attr for attr in interface.attributes
-                  if not self._IsEventAttribute(interface, attr)]
+                  if attr.type.id != 'EventListener']
     for (getter, setter) in  _PairUpAttributes(attributes):
       for generator in generators:
         generator.AddAttribute(getter, setter)
 
     # The implementation should define an indexer if the interface directly
     # extends List.
     element_type = MaybeListElementType(interface)
     if element_type:
       for generator in generators:
         generator.AddIndexer(element_type)
@@ skipping 37 matching lines @@
         if not any(op.id == id for op in interface.operations):
           operations = operationsById[id]
           info = AnalyzeOperation(interface, operations)
           for generator in generators:
             generator.AddSecondaryOperation(parent_interface, info)
 
     for generator in generators:
       generator.FinishInterface()
     return
 
-  def _IsEventAttribute(self, interface, attr):
-    # Remove EventListener attributes like 'onclick' when addEventListener
-    # is available.
-    return (attr.type.id == 'EventListener' and
-        'EventTarget' in self._AllImplementedInterfaces(interface))
-
   def _TransitiveSecondaryParents(self, interface):
     """Returns a list of all non-primary parents.
 
     The list contains the interface objects for interfaces defined in the
     database, and the name for undefined interfaces.
     """
     def walk(parents):
       for parent in parents:
         if IsDartCollectionType(parent.type.id):
           result.append(parent.type.id)
@@ skipping 43 matching lines @@
           if not '<' in parent.type.id:
             if self._database.HasInterface(parent.type.id):
               Collect(self._database.GetInterface(parent.type.id),
                       seen, collected)
 
     self._inheritance_closure = {}
     for interface in self._database.GetInterfaces():
       seen = set()
       collected = []
       Collect(interface, seen, collected)
+      if 'EventTarget' in interface.ext_attrs:
+        collected.append('EventTarget')

[sra1, 2012/04/11 20:23:05]

Why do you need this if you added a parent interface?

[podivilov, 2012/04/12 14:37:41]

_ComputeInheritanceClosure is called too early, I moved EventTarget parent hack
here and removed this check.

       self._inheritance_closure[interface.id] = collected
 
   def _AllImplementedInterfaces(self, interface):
     """Returns a list of the names of all interfaces implemented by 'interface'.
     List includes the name of 'interface'.
     """
     return self._inheritance_closure[interface.id]
 
 def _PairUpAttributes(attributes):
   """Returns a list of (getter, setter) pairs sorted by name.
@@ skipping 91 matching lines @@
     pass
 
   def AddTypedArrayConstructors(self, element_type):
     pass
 
   def AddOperation(self, info):
     pass
 
   def AddEventAttributes(self, event_attrs):
     pass