Merge the Sky Engine changes from the SkyDart branch

sky/tools/webkitpy/bindings/main.py

 # Copyright (C) 2011 Google Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 25 matching lines @@
 # Python modules.
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir,
                                             os.pardir, os.pardir, 'engine'))
 sys.path.append(source_path)  # for engine/bindings imports
 
 import bindings.scripts.compute_interfaces_info_individual
 from bindings.scripts.compute_interfaces_info_individual import compute_info_individual, info_individual
 import bindings.scripts.compute_interfaces_info_overall
 from bindings.scripts.compute_interfaces_info_overall import compute_interfaces_info_overall, interfaces_info
-from bindings.scripts.idl_compiler import IdlCompilerDictionaryImpl, IdlCompilerV8
+from bindings.scripts.idl_compiler import IdlCompilerV8
 
 
 PASS_MESSAGE = 'All tests PASS!'
 FAIL_MESSAGE = """Some tests FAIL!
 To update the reference files, execute:
     run-bindings-tests --reset-results
 
 If the failures are not due to your changes, test results may be out of sync;
 please rebaseline them in a separate CL, after checking that tests fail in ToT.
 In CL, please set:
@@ skipping 128 matching lines @@
                   '(probably cruft from renaming or deleting):\n' +
                   '\n'.join(excess_files))
             return False
         return True
 
     try:
         generate_interface_dependencies()
         idl_compiler = IdlCompilerV8(output_directory,
                                      interfaces_info=interfaces_info,
                                      only_if_changed=True)
-        dictionary_impl_compiler = IdlCompilerDictionaryImpl(
-            output_directory, interfaces_info=interfaces_info,
-            only_if_changed=True)
 
         idl_basenames = [filename
                          for filename in os.listdir(test_input_directory)
                          if (filename.endswith('.idl') and
                              # Dependencies aren't built
                              # (they are used by the dependent)
                              filename not in DEPENDENCY_IDL_FILES)]
         for idl_basename in idl_basenames:
             idl_path = os.path.realpath(
                 os.path.join(test_input_directory, idl_basename))
             idl_compiler.compile_file(idl_path)
             definition_name, _ = os.path.splitext(idl_basename)
-            if (definition_name in interfaces_info and
-                interfaces_info[definition_name]['is_dictionary']):
-                dictionary_impl_compiler.compile_file(idl_path)
             if verbose:
                 print 'Compiled: %s' % filename
     finally:
         delete_cache_files()
 
     # Detect all changes
     passed = identical_output_files()
     passed &= no_excess_files()
 
     if passed:
         if verbose:
             print
             print PASS_MESSAGE
         return 0
     print
     print FAIL_MESSAGE
     return 1
 
 
 def run_bindings_tests(reset_results, verbose):
     # Generate output into the reference directory if resetting results, or
     # a temp directory if not.
     if reset_results:
         print 'Resetting results'
         return bindings_tests(reference_directory, verbose)
     with TemporaryDirectory() as temp_dir:
         return bindings_tests(temp_dir, verbose)