Revert "Add @JSName annotation for native fields and methods."

sdk/lib/html/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 os
@@ skipping 489 matching lines @@
     template = self._template_loader.Load(
         template_file,
         {'DEFINE_CONTAINS': not has_contains})
     self._members_emitter.Emit(template, E=self._DartType(element_type))
 
   def EmitAttribute(self, attribute, html_name, read_only):
     if self._HasCustomImplementation(attribute.id):
       return
 
     if IsPureInterface(self._interface.id):
-      self._AddInterfaceAttribute(attribute, html_name)
+      self._AddInterfaceAttribute(attribute)
+      return
+
+    if attribute.id != html_name:
+      self._AddAttributeUsingProperties(attribute, html_name, read_only)
       return
 
     # If the attribute is shadowing, we can't generate a shadowing
     # field (Issue 1633).
     # TODO(sra): _FindShadowedAttribute does not take into account the html
     #  renaming.  we should be looking for another attribute that has the same
     #  html_name.  Two attributes with the same IDL name might not match if one
     #  is renamed.
     (super_attribute, super_attribute_interface) = self._FindShadowedAttribute(
         attribute)
     if super_attribute:
       if read_only:
         if attribute.type.id == super_attribute.type.id:
           # Compatible attribute, use the superclass property.  This works
           # because JavaScript will do its own dynamic dispatch.
           self._members_emitter.Emit(
               '\n'
               '  // Use implementation from $SUPER.\n'
               '  // final $TYPE $NAME;\n',
               SUPER=super_attribute_interface,
-              NAME=html_name,
+              NAME=DartDomNameOfAttribute(attribute),
               TYPE=self.SecureOutputType(attribute.type.id))
           return
       self._members_emitter.Emit('\n  // Shadowing definition.')
       self._AddAttributeUsingProperties(attribute, html_name, read_only)
       return
 
     # If the type has a conversion we need a getter or setter to contain the
     # conversion code.
     if (self._OutputConversion(attribute.type.id, attribute.id) or
         self._InputConversion(attribute.type.id, attribute.id)):
       self._AddAttributeUsingProperties(attribute, html_name, read_only)
       return
 
     output_type = self.SecureOutputType(attribute.type.id)
     input_type = self._NarrowInputType(attribute.type.id)
     annotations = self._Annotations(attribute.type.id, attribute.id)
-    rename = self._RenamingAnnotation(attribute.id, html_name)
     self.EmitAttributeDocumentation(attribute)
     if not read_only:
       self._members_emitter.Emit(
-          '\n  $RENAME$ANNOTATIONS$TYPE $NAME;'
+          '\n  $ANNOTATIONS$TYPE $NAME;'
           '\n',
-          RENAME=rename,
           ANNOTATIONS=annotations,
-          NAME=html_name,
+          NAME=DartDomNameOfAttribute(attribute),
           TYPE=output_type)
     else:
       self._members_emitter.Emit(
-          '\n  $RENAME$(ANNOTATIONS)final $TYPE $NAME;'
+          '\n  $(ANNOTATIONS)final $TYPE $NAME;'
           '\n',
-          RENAME=rename,
           ANNOTATIONS=annotations,
-          NAME=html_name,
+          NAME=DartDomNameOfAttribute(attribute),
           TYPE=output_type)
 
   def _AddAttributeUsingProperties(self, attribute, html_name, read_only):
     self._AddRenamingGetter(attribute, html_name)
     if not read_only:
       self._AddRenamingSetter(attribute, html_name)
 
-  def _AddInterfaceAttribute(self, attribute, html_name):
+  def _AddInterfaceAttribute(self, attribute):
     self._members_emitter.Emit(
         '\n  $TYPE $NAME;'
         '\n',
-        NAME=html_name,
+        NAME=DartDomNameOfAttribute(attribute),
         TYPE=self.SecureOutputType(attribute.type.id))
 
   def _AddRenamingGetter(self, attr, html_name):
     self.EmitAttributeDocumentation(attr)
 
     conversion = self._OutputConversion(attr.type.id, attr.id)
     if conversion:
       return self._AddConvertingGetter(attr, html_name, conversion)
     return_type = self.SecureOutputType(attr.type.id)
     native_type = self._NarrowToImplementationType(attr.type.id)
@@ skipping 17 matching lines @@
         '\n  void set $HTML_NAME($TYPE value) {'
         '\n    JS("void", "#.$NAME = #", this, value);'
         '\n  }'
         '\n',
         HTML_NAME=html_name,
         NAME=attr.id,
         TYPE=self._NarrowInputType(attr.type.id))
 
   def _AddConvertingGetter(self, attr, html_name, conversion):
     self._members_emitter.Emit(
+        # TODO(sra): Use metadata to provide native name.
         '\n  $RETURN_TYPE get $HTML_NAME => $CONVERT(this._$(HTML_NAME));'
-        "\n  @JSName('$NAME')"
-        '\n  $(ANNOTATIONS)final $NATIVE_TYPE _$HTML_NAME;'
+        '\n  $NATIVE_TYPE get _$HTML_NAME =>'
+        ' JS("$NATIVE_TYPE", "#.$NAME", this);'
         '\n',
-        ANNOTATIONS=self._Annotations(attr.type.id, html_name),
         CONVERT=conversion.function_name,
         HTML_NAME=html_name,
         NAME=attr.id,
         RETURN_TYPE=conversion.output_type,
         NATIVE_TYPE=conversion.input_type)
 
   def _AddConvertingSetter(self, attr, html_name, conversion):
     self._members_emitter.Emit(
         # TODO(sra): Use metadata to provide native name.
         '\n  void set $HTML_NAME($INPUT_TYPE value) {'
@@ skipping 24 matching lines @@
 
     if IsPureInterface(self._interface.id):
       self._AddInterfaceOperation(info, html_name)
     elif any(self._OperationRequiresConversions(op) for op in info.overloads):
       # Any conversions needed?
       self._AddOperationWithConversions(info, html_name)
     else:
       self._AddDirectNativeOperation(info, html_name)
 
   def _AddDirectNativeOperation(self, info, html_name):
-    self._members_emitter.Emit(
-        '\n'
-        '  $RENAME$ANNOTATIONS$MODIFIERS$TYPE $NAME($PARAMS) native;\n',
-        RENAME=self._RenamingAnnotation(info.declared_name, html_name),
-        ANNOTATIONS=self._Annotations(info.type_name, info.declared_name),
-        MODIFIERS='static ' if info.IsStatic() else '',
-        TYPE=self.SecureOutputType(info.type_name),
-        NAME=html_name,
-        PARAMS=info.ParametersDeclaration(self._NarrowInputType))
+    # Do we need a native body?
+    if html_name != info.declared_name:
+      return_type = self.SecureOutputType(info.type_name)
+
+      operation_emitter = self._members_emitter.Emit(
+          '$!SCOPE',
+          MODIFIERS='static ' if info.IsStatic() else '',
+          ANNOTATIONS=self._Annotations(info.type_name, info.declared_name),
+          TYPE=return_type,
+          HTML_NAME=html_name,
+          NAME=info.declared_name,
+          PARAMS=info.ParametersDeclaration(self._NarrowInputType))
+
+      operation_emitter.Emit(
+          '\n'
+          '  $ANNOTATIONS'
+          '$MODIFIERS$TYPE $(HTML_NAME)($PARAMS) native "$NAME";\n')
+    else:
+      self._members_emitter.Emit(
+          '\n'
+          '  $ANNOTATIONS$MODIFIERS$TYPE $NAME($PARAMS) native;\n',
+          MODIFIERS='static ' if info.IsStatic() else '',
+          ANNOTATIONS=self._Annotations(info.type_name, info.declared_name),
+          TYPE=self.SecureOutputType(info.type_name),
+          NAME=info.name,
+          PARAMS=info.ParametersDeclaration(self._NarrowInputType))
 
   def _AddOperationWithConversions(self, info, html_name):
     # Assert all operations have same return type.
     assert len(set([op.type.id for op in info.operations])) == 1
     output_conversion = self._OutputConversion(info.type_name,
                                                info.declared_name)
     if output_conversion:
       return_type = output_conversion.output_type
       native_return_type = output_conversion.input_type
     else:
@@ skipping 78 matching lines @@
       if output_conversion:
         call = '%s(%s)' % (output_conversion.function_name, call)
 
       if operation.type.id == 'void':
         call_emitter.Emit('$(INDENT)$CALL;\n$(INDENT)return;\n',
                           CALL=call)
       else:
         call_emitter.Emit('$(INDENT)return $CALL;\n', CALL=call)
 
       self._members_emitter.Emit(
-          '  $RENAME$ANNOTATIONS$MODIFIERS$TYPE$TARGET($PARAMS) native;\n',
-          RENAME=self._RenamingAnnotation(info.declared_name, target),
+          '  $MODIFIERS$ANNOTATIONS$TYPE$TARGET($PARAMS) native "$NATIVE";\n',
+          MODIFIERS='static ' if info.IsStatic() else '',
           ANNOTATIONS=self._Annotations(info.type_name, info.declared_name),
-          MODIFIERS='static ' if info.IsStatic() else '',
           TYPE=TypeOrNothing(native_return_type),
           TARGET=target,
-          PARAMS=', '.join(target_parameters))
+          PARAMS=', '.join(target_parameters),
+          NATIVE=info.declared_name)
 
     def GenerateChecksAndCall(operation, argument_count):
       checks = []
       for i in range(0, argument_count):
         argument = operation.arguments[i]
         parameter_name = parameter_names[i]
         test_type = self._DartType(argument.type.id)
         if test_type in ['dynamic', 'Object']:
           checks.append('?%s' % parameter_name)
         elif test_type != parameter_types[i]:
@@ skipping 59 matching lines @@
     return FindConversion(idl_type, 'get', self._interface.id, member)
 
   def _InputConversion(self, idl_type, member):
     return FindConversion(idl_type, 'set', self._interface.id, member)
 
   def _HasCustomImplementation(self, member_name):
     member_name = '%s.%s' % (self._interface_type_info.interface_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 _Annotations(self, idl_type, idl_member_name):
-    annotations = FindAnnotations(idl_type, self._interface.id, idl_member_name)
+  def _Annotations(self, idl_type, member_name):
+    annotations = FindAnnotations(idl_type, self._interface.id, member_name)
     if annotations:
       return '%s\n  ' % annotations
     return_type = self.SecureOutputType(idl_type)
     native_type = self._NarrowToImplementationType(idl_type)
     if native_type != return_type:
       return "@Returns('%s') @Creates('%s')\n  " % (native_type, native_type)
     else:
       return ''
 
   def CustomJSMembers(self):
@@ skipping 104 matching lines @@
       'svg': DartLibrary('svg', template_loader, library_type, output_dir),
       'html': DartLibrary('html', 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)