Changing metadata lookup to always use interface.id

tools/dom/scripts/systemhtml.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
 import monitored
@@ skipping 512 matching lines @@
       implements_str = ' implements ' + ', '.join(set(implements))
 
     mixins = self._backend.Mixins()
     mixins_str = ''
     if mixins:
       mixins_str = ' with ' + ', '.join(mixins)
       if not base_class:
         base_class = 'Object'
 
     annotations = self._metadata.GetFormattedMetadata(
-        self._library_name, self._interface.doc_js_name, '')
+        self._library_name, self._interface, None, '')
 
     class_modifiers = ''
     if self._renamer.ShouldSuppressInterface(self._interface):
       class_modifiers = 'abstract '
 
     self._implementation_members_emitter = implementation_emitter.Emit(
         self._backend.ImplementationTemplate(),
         LIBRARYNAME='dart.dom.%s' % self._library_name,
         ANNOTATIONS=annotations,
         CLASS_MODIFIERS=class_modifiers,
@@ skipping 495 matching lines @@
     member_name = '%s.%s' % (self._interface.doc_js_name, member_name)
     return member_name in _js_custom_members
 
   def _RenamingAnnotation(self, idl_name, member_name):
     if member_name != idl_name:
       return  "@JSName('%s')\n  " % idl_name
     return ''
 
   def _Metadata(self, idl_type, idl_member_name, indent='  '):
     anns = self._metadata.GetDart2JSMetadata(
-        idl_type, self._library_name, self._interface.id, idl_member_name)
+        idl_type, self._library_name, self._interface, idl_member_name)
 
     if not self._metadata.AnyConversionAnnotations(
         idl_type, self._interface.id, idl_member_name):
       return_type = self.SecureOutputType(idl_type)
       native_type = self._NarrowToImplementationType(idl_type)
       if native_type != return_type:
         anns = anns + [
           "@Returns('%s')" % native_type,
           "@Creates('%s')" % native_type,
         ]
@@ skipping 107 matching lines @@
     for library_name in libraries:
       self._libraries[library_name] = DartLibrary(
           library_name, template_loader, library_type, output_dir)
 
   def AddFile(self, basename, library_name, path):
     self._libraries[library_name].AddFile(path)
 
   def Emit(self, emitter, auxiliary_dir):
     for lib in self._libraries.values():
       lib.Emit(emitter, auxiliary_dir)