Changing metadata lookup to always use interface.id

tools/dom/scripts/dartmetadata.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 to provide Dart metadata for
 DOM APIs.
 """
 
 import copy
@@ skipping 244 matching lines @@
   'DatabaseSync': _web_sql_annotations,
   'DOMApplicationCache': [
     "@SupportedBrowser(SupportedBrowser.CHROME)",
     "@SupportedBrowser(SupportedBrowser.FIREFOX)",
     "@SupportedBrowser(SupportedBrowser.IE, '10')",
     "@SupportedBrowser(SupportedBrowser.OPERA)",
     "@SupportedBrowser(SupportedBrowser.SAFARI)",
   ],
   'DOMFileSystem': _file_system_annotations,
   'DOMFileSystemSync': _file_system_annotations,
+  'DOMPoint': _webkit_experimental_annotations,
   'DOMWindow.webkitConvertPointFromNodeToPage': _webkit_experimental_annotations,
   'DOMWindow.webkitConvertPointFromPageToNode': _webkit_experimental_annotations,
   'DOMWindow.indexedDB': _indexed_db_annotations,
   'DOMWindow.openDatabase': _web_sql_annotations,
   'DOMWindow.performance': _performance_annotations,
   'DOMWindow.webkitNotifications': _webkit_experimental_annotations,
   'DOMWindow.webkitRequestFileSystem': _file_system_annotations,
   'DOMWindow.webkitResolveLocalFileSystemURL': _file_system_annotations,
   'Element.onwebkitTransitionEnd': _all_but_ie9_annotations,
   # Placeholder to add experimental flag, implementation for this is
   # pending in a separate CL.
   'Element.webkitMatchesSelector': ['@Experimental()'],
   'Element.webkitCreateShadowRoot': [
     "@SupportedBrowser(SupportedBrowser.CHROME, '25')",
     "@Experimental",
   ],
   'Event.clipboardData': _webkit_experimental_annotations,
-  'FormData': _all_but_ie9_annotations,
+  'DOMFormData': _all_but_ie9_annotations,
   'HashChangeEvent': [
     "@SupportedBrowser(SupportedBrowser.CHROME)",
     "@SupportedBrowser(SupportedBrowser.FIREFOX)",
     "@SupportedBrowser(SupportedBrowser.SAFARI)",
   ],
   'History.pushState': _history_annotations,
   'History.replaceState': _history_annotations,
   'HTMLContentElement': _shadow_dom_annotations,
   'HTMLDataListElement': _all_but_ie9_annotations,
   'HTMLDetailsElement': _webkit_experimental_annotations,
@@ skipping 70 matching lines @@
   'SVGFESpotLightElement': _svg_annotations,
   'SVGFETileElement': _svg_annotations,
   'SVGFETurbulenceElement': _svg_annotations,
   'SVGFilterElement': _svg_annotations,
   'SVGForeignObjectElement': _no_ie_annotations,
   'SVGSetElement': _no_ie_annotations,
   'SQLTransaction': _web_sql_annotations,
   'SQLTransactionSync': _web_sql_annotations,
   'WebGLRenderingContext': _webgl_annotations,
   'WebKitCSSMatrix': _webkit_experimental_annotations,
-  'WebKitPoint': _webkit_experimental_annotations,
   'WebSocket': _all_but_ie9_annotations,
   'Worker': _all_but_ie9_annotations,
   'XMLHttpRequest.onloadend': _all_but_ie9_annotations,
   'XMLHttpRequest.onprogress': _all_but_ie9_annotations,
   'XMLHttpRequest.response': _all_but_ie9_annotations,
   'XMLHttpRequestProgressEvent': _webkit_experimental_annotations,
   'XSLTProcessor': [
     "@SupportedBrowser(SupportedBrowser.CHROME)",
     "@SupportedBrowser(SupportedBrowser.FIREFOX)",
     "@SupportedBrowser(SupportedBrowser.SAFARI)",
   ],
 })
 
 
 class DartMetadata(object):
   def __init__(self, api_status_path, doc_comments_path):
     self._api_status_path = api_status_path
     status_file = open(self._api_status_path, 'r+')
     self._types = json.load(status_file)
     status_file.close()
 
     comments_file = open(doc_comments_path, 'r+')
     self._doc_comments = json.load(comments_file)
     comments_file.close()
 
-  def GetFormattedMetadata(self, library_name, interface_name, member_id=None,
+  def GetFormattedMetadata(self, library_name, interface, member_id=None,
       indentation=''):
     """ Gets all comments and annotations for an interface or member.
     """
     return self.FormatMetadata(
-        self.GetMetadata(library_name, interface_name, member_id),
+        self.GetMetadata(library_name, interface, member_id),
         indentation)
 
-  def GetMetadata(self, library_name, interface_name,
+  def GetMetadata(self, library_name, interface,
         member_name=None, source_member_name=None):
     """ Gets all comments and annotations for an interface or member.
 
     Args:
       source_member_name: If the member is dependent on a different member
         then this is used to apply the support annotations from the other
         member.
     """
-    annotations = self._GetComments(library_name, interface_name, member_name)
+    annotations = self._GetComments(library_name, interface, member_name)
     annotations = annotations + self._GetCommonAnnotations(
-        interface_name, member_name, source_member_name)
+        interface, member_name, source_member_name)
 
     return annotations
 
   def GetDart2JSMetadata(self, idl_type, library_name,
-      interface_name, member_name,):
+      interface, member_name,):
     """ Gets all annotations for Dart2JS members- including annotations for
     both dart2js and dartium.
     """
-    annotations = self.GetMetadata(library_name, interface_name, member_name)
+    annotations = self.GetMetadata(library_name, interface, member_name)
 
-    ann2 = self._GetDart2JSSpecificAnnotations(idl_type, interface_name, member_name)
+    ann2 = self._GetDart2JSSpecificAnnotations(idl_type, interface.id, member_name)
     if ann2:
       if annotations:
         annotations.extend(ann2)
       else:
         annotations = ann2
     return annotations
 
-  def _GetCommonAnnotations(self, interface_name, member_name=None,
+  def _GetCommonAnnotations(self, interface, member_name=None,
       source_member_name=None):
     if member_name:
-      key = '%s.%s' % (interface_name, member_name)
+      key = '%s.%s' % (interface.id, member_name)
+      dom_name = '%s.%s' % (interface.javascript_binding_name, member_name)
     else:
-      key = interface_name
+      key = interface.id
+      dom_name = interface.javascript_binding_name
 
-    annotations = ["@DomName('" + key + "')"]
+    annotations = ["@DomName('" + dom_name + "')"]
 
     # Only add this for members, so we don't add DocsEditable to templated
     # classes (they get it from the default class template)
     if member_name:
       annotations.append('@DocsEditable');
 
     if key in _annotations:
       annotations.extend(_annotations[key])
 
-    if (not member_name and interface_name.startswith('WebKit') and
-        interface_name not in html_interface_renames):
+    if (not member_name and
+        interface.javascript_binding_name.startswith('WebKit') and
+        interface.id not in html_interface_renames):
       annotations.extend(_webkit_experimental_annotations)
 
     if (member_name and member_name.startswith('webkit') and
         key not in renamed_html_members):
       annotations.extend(_webkit_experimental_annotations)
 
     if source_member_name:
       member_name = source_member_name
 
     # TODO(blois): Emit support level annotations
-    self._GetSupportLevelAnnotation(interface_name, member_name)
+    self._GetSupportLevelAnnotation(interface.id, member_name)
 
     return annotations
 
-  def _GetComments(self, library_name, interface_name, member_name=None):
+  def _GetComments(self, library_name, interface, member_name=None):
     """ Gets all comments for the interface or member and returns a list. """
 
     # Add documentation from JSON.
     comments = []
     library_name = 'dart.dom.%s' % library_name
     if library_name in self._doc_comments:
       library_info = self._doc_comments[library_name]
-      if interface_name in library_info:
-        interface_info = library_info[interface_name]
+      if interface.id in library_info:
+        interface_info = library_info[interface.id]
         if member_name:
           if 'members' in interface_info and member_name in interface_info['members']:
             comments = interface_info['members'][member_name]
         elif 'comment' in interface_info:
           comments = interface_info['comment']
 
     if comments:
       comments = ['\n'.join(comments)]
 
     return comments
@@ skipping 79 matching lines @@
       return
     elif support_level == 'deprecated':
       return '@Deprecated'
     else:
       _logger.warn('Unknown support_level - %s:%s' % (interface.id, member_id))
 
   def Flush(self):
     json_file = open(self._api_status_path, 'w+')
     json.dump(self._types, json_file, indent=2, separators=(',', ': '), sort_keys=True)
     json_file.close()