Attempt to land Dartium roll a second time.

tools/dom/scripts/htmldartgenerator.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 the system to generate
 dart:html APIs from the IDL database."""
 
 import emitter
 from generator import AnalyzeOperation, ConstantOutputOrder, \
@@ skipping 54 matching lines @@
         "EventTarget.removeEventListener, EventTarget.dispatchEvent')"
         "\n  @deprecated"
         "\n  $TYPE get on =>\n    new $TYPE(this);\n",
         TYPE=events_class_name)
 
   def AddMembers(self, interface, declare_only=False):
     for const in sorted(interface.constants, ConstantOutputOrder):
       self.AddConstant(const)
 
     for attr in sorted(interface.attributes, ConstantOutputOrder):
-      if attr.type.id != 'EventListener':
+      if attr.type.id != 'EventHandler' and attr.type.id != 'EventListener':
         self.AddAttribute(attr, declare_only)
 
     # The implementation should define an indexer if the interface directly
     # extends List.
     element_type = None
     requires_indexer = False
     if self._interface_type_info.list_item_type():
       self.AddIndexer(self._interface_type_info.list_item_type())
     else:
       for parent in self._database.Hierarchy(self._interface):
@@ skipping 24 matching lines @@
     # With multiple inheritance, attributes and operations of non-first
     # interfaces need to be added.  Sometimes the attribute or operation is
     # defined in the current interface as well as a parent.  In that case we
     # avoid making a duplicate definition and pray that the signatures match.
     secondary_parents = self._database.TransitiveSecondaryParents(interface)
     for parent_interface in sorted(secondary_parents):
       if isinstance(parent_interface, str):
         continue
       for attr in sorted(parent_interface.attributes, ConstantOutputOrder):
         if not FindMatchingAttribute(interface, attr):
-          if attr.type.id != 'EventListener':
+          if attr.type.id != 'EventHandler':
             self.SecondaryContext(parent_interface)
             self.AddAttribute(attr)
 
       # Group overloaded operations by name.
       operationsByName =self._OperationsByName(parent_interface)
 
       if self.OmitOperationOverrides():
         self._RemoveShadowingOperationsWithSameSignature(operationsByName,
             interface)
 
@@ skipping 532 matching lines @@
     if dart_name == 'Window':
       return _secure_base_types[dart_name]
     return dart_name
 
   def SecureBaseName(self, type_name):
     if type_name in _secure_base_types:
       return _secure_base_types[type_name]
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)