Revert "Annotate dart:html constructor expressions with precise non-nullable types."

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 529 matching lines @@
       factory_constructor_name = '_create'
       factory_parameters = constructor_info.ParametersAsArgumentList()
     else:
       factory_parameters = ', '.join(constructor_info.factory_parameters)
 
     if constructor_info.pure_dart_constructor:
       # TODO(antonm): use common dispatcher generation for this case as well.
       has_optional = any(param_info.is_optional
           for param_info in constructor_info.param_infos)
 
-      factory_expression = self.FactoryConstructorExpression(constructor_info,
-          factory_name, factory_constructor_name, factory_parameters)
-
       if not has_optional:
         self._members_emitter.Emit(
             '\n  $(METADATA)'
-            'factory $CTOR($PARAMS) => $FACTORY_EXPRESSION;\n',
+            'factory $CTOR($PARAMS) => '
+            '$FACTORY.$CTOR_FACTORY_NAME($FACTORY_PARAMS);\n',
             CTOR=constructor_info._ConstructorFullName(self._DartType),
             PARAMS=constructor_info.ParametersAsDeclaration(self._DartType),
-            FACTORY_EXPRESSION=factory_expression,
-            METADATA=metadata)
+            FACTORY=factory_name,
+            METADATA=metadata,
+            CTOR_FACTORY_NAME=factory_constructor_name,
+            FACTORY_PARAMS=factory_parameters)
       else:
         inits = self._members_emitter.Emit(
             '\n  $(METADATA)'
             'factory $CONSTRUCTOR($PARAMS) {\n'
-            '    var e = $FACTORY_EXPRESSION;\n'
+            '    var e = $FACTORY.$CTOR_FACTORY_NAME($FACTORY_PARAMS);\n'
             '$!INITS'
             '    return e;\n'
             '  }\n',
             CONSTRUCTOR=constructor_info._ConstructorFullName(self._DartType),
             METADATA=metadata,
-            FACTORY_EXPRESSION=factory_expression,
-            PARAMS=constructor_info.ParametersAsDeclaration(self._DartType))
+            FACTORY=factory_name,
+            CTOR_FACTORY_NAME=factory_constructor_name,
+            PARAMS=constructor_info.ParametersAsDeclaration(self._DartType),
+            FACTORY_PARAMS=factory_parameters)
 
         for index, param_info in enumerate(constructor_info.param_infos):
           if param_info.is_optional:
             inits.Emit('    if ($E != null) e.$E = $E;\n', E=param_info.name)
     else:
       custom_factory_ctr = self._interface.id in _custom_factories
       constructor_full_name = constructor_info._ConstructorFullName(
           self._DartType)
 
       def GenerateCall(
@@ skipping 36 matching lines @@
 
       self._GenerateOverloadDispatcher(
           constructor_info,
           constructor_info.idl_args,
           False,
           overload_declaration,
           GenerateCall,
           IsOptional,
           overload_emitter)
 
-  def FactoryConstructorExpression(self, constructor_info,
-      factory_name, factory_constructor_name, factory_parameters):
-    return emitter.Format(
-        '$FACTORY.$CTOR_FACTORY_NAME($FACTORY_PARAMS)',
-        FACTORY=factory_name,
-        CTOR_FACTORY_NAME=factory_constructor_name,
-        FACTORY_PARAMS=factory_parameters);
-
   def _AddFutureifiedOperation(self, info, html_name):
     """Given a API function that uses callbacks, convert it to using Futures.
 
     This conversion assumes the success callback is always provided before the
     error callback (and so far in the DOM API, this is the case)."""
     callback_info = GetCallbackInfo(
         self._database.GetInterface(info.callback_args[0].type_id))
 
     param_list = info.ParametersAsArgumentList()
     metadata = ''
@@ skipping 137 matching lines @@
     return self._type_registry.TypeInfo(type_name).narrow_dart_type()
 
   def _NarrowInputType(self, type_name):
     return self._NarrowToImplementationType(type_name)
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)
 
   def _TypeInfo(self, type_name):
     return self._type_registry.TypeInfo(type_name)