Roll 50: Updated for push to origin/master.

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 375 matching lines @@
 
       if is_void:
         call_emitter = call_emitter.Emit('$(INDENT)$!CALL;\n$(INDENT)return;\n')
       else:
         call_emitter = call_emitter.Emit('$(INDENT)return $!CALL;\n')
 
       version[0] += 1
       generate_call(stmts_emitter, call_emitter,
           version[0], signature_index, argument_count)
 
+    def IsTypeChecking(interface_argument):
+      return 'LegacyInterfaceTypeChecking' in interface_argument.ext_attrs or \
+      self._database.HasInterface(interface_argument.id)
+
     def GenerateChecksAndCall(signature_index, argument_count):
       checks = []
-      typechecked_interface = \
-          ('TypeChecking' in self._interface.ext_attrs) and \
-          ('Interface' in self._interface.ext_attrs['TypeChecking'])
+      typechecked_interface = IsTypeChecking(self._interface)
 
       for i in reversed(range(0, argument_count)):
         argument = signatures[signature_index][i]
         parameter_name = parameter_names[i]
 
         test_type = self._NarrowToImplementationType(argument.type.id)
 
         if test_type in ['dynamic', 'Object']:
           checks.append('%s != null' % parameter_name)
         elif not can_omit_type_check(test_type, i):
-          typechecked = typechecked_interface or \
-              ('TypeChecking' in argument.ext_attrs) and \
-              ('Interface' in argument.ext_attrs['TypeChecking'])
+          typechecked = typechecked_interface or IsTypeChecking(argument)
           converts_null = \
               ('TreatNullAs' in argument.ext_attrs) or \
               (argument.default_value is not None) or \
               (argument.default_value_is_null)
           if argument.type.nullable or converts_null or not typechecked:
             checks.append('(%s is %s || %s == null)' % (
                 parameter_name, test_type, parameter_name))
           else:
             checks.append('(%s is %s)' % (
                 parameter_name, test_type))
@@ skipping 110 matching lines @@
       factory_constructor_name - The name of the constructor on the
           factory_name to call (calls an autogenerated FactoryProvider
           if unspecified)
     """
     for constructor_info in constructors:
       self._AddConstructor(
           constructor_info, factory_name, factory_constructor_name)
 
   def _AddConstructor(self,
       constructor_info, factory_name, factory_constructor_name):
-    # Hack to ignore the Image constructor used by JavaScript.
+    # Hack to ignore the constructor used by JavaScript.
     if ((self._interface.id == 'HTMLImageElement' or
          self._interface.id == 'Blob' or
+         self._interface.id == 'TouchEvent' or
          self._interface.id == 'DOMException')
       and not constructor_info.pure_dart_constructor):
       return
 
     if self.GenerateCustomFactory(constructor_info):
       return
 
     metadata = self._metadata.GetFormattedMetadata(
         self._library_name, self._interface, self._interface.id, '  ')
 
@@ skipping 335 matching lines @@
   def _InputType(self, type_name, info):
     conversion = self._InputConversion(type_name, info.declared_name)
     if conversion:
       return conversion.input_type
     else:
       # If typedef it's a union return dynamic.
       if self._database.HasTypeDef(type_name):
         return 'dynamic'
       else:
         return self._NarrowInputType(type_name) if type_name else 'dynamic'