Changing metadata lookup to always use interface.id

tools/dom/scripts/htmleventgenerator.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 functionality to generate dart:html event classes."""
 
 import logging
 import monitored
 
@@ skipping 218 matching lines @@
 
     for event_info in events:
       (dom_name, html_name, event_type) = event_info
       annotation_name = dom_name + 'Event'
 
       # If we're using a different provider, then don't declare one.
       if self._GetEventRedirection(interface, html_name, event_type):
         continue
 
       annotations = self._metadata.FormatMetadata(
-          self._metadata.GetMetadata(library_name, interface.id,
+          self._metadata.GetMetadata(library_name, interface,
               annotation_name, 'on' + dom_name), '  ')
 
       members_emitter.Emit(
           "\n"
           "  $(ANNOTATIONS)static const EventStreamProvider<$TYPE> "
           "$(NAME)Event = const EventStreamProvider<$TYPE>('$DOM_NAME');\n",
           ANNOTATIONS=annotations,
           NAME=html_name,
           DOM_NAME=dom_name,
           TYPE=event_type)
@@ skipping 10 matching lines @@
       annotation_name = 'on' + dom_name
 
       # If the provider is declared elsewhere, point to that.
       redirection = self._GetEventRedirection(interface, html_name, event_type)
       if redirection:
         provider = '%s.%sEvent' % (redirection, html_name)
       else:
         provider = html_name + 'Event'
 
       annotations = self._metadata.GetFormattedMetadata(
-          library_name, interface.id, annotation_name, '  ')
+          library_name, interface, annotation_name, '  ')
 
       members_emitter.Emit(
           "\n"
           "  $(ANNOTATIONS)Stream<$TYPE> get $(NAME) => "
           "$PROVIDER.forTarget(this);\n",
           ANNOTATIONS=annotations,
           NAME=getter_name,
           PROVIDER=provider,
           TYPE=event_type)
 
@@ skipping 67 matching lines @@
     """
     key = '%s.%s' % (html_interface_name, dom_event_name)
     if key in _html_event_types:
       return _html_event_types[key]
     key = '*.%s' % dom_event_name
     if key in _html_event_types:
       return _html_event_types[key]
     _logger.warn('Cannot resolve event type for %s.%s' %
         (html_interface_name, dom_event_name))
     return None