Refactor partial interface resolving and merging into InterfaceMerger.pm

Source/bindings/derived_sources.gyp

 #
 # Copyright (C) 2013 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:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
     ],
   },
 
   'target_defaults': {
     'variables': {
       'optimize': 'max',
     },
   },
 
   'targets': [{
-    'target_name': 'supplemental_dependencies',
+    'target_name': 'idl_dependencies',
     'type': 'none',
     'actions': [{
       'action_name': 'generatePartialInterfacesDependency',
       'variables': {
         # Write sources into a file, so that the action command line won't
         # exceed OS limits.
         'idl_files_list': '<|(idl_files_list.tmp <@(idl_files))',
       },
       'inputs': [
         'scripts/preprocess_idls.py',
         '<(idl_files_list)',
         '<!@(cat <(idl_files_list))',
        ],
        'outputs': [
-         '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+         '<(SHARED_INTERMEDIATE_DIR)/idl_dependencies.tmp',
          '<(SHARED_INTERMEDIATE_DIR)/DOMWindowConstructors.idl',
        ],
        'msvs_cygwin_shell': 0,
        'action': [
          'python',
          'scripts/preprocess_idls.py',
          '--idl-files-list',
          '<(idl_files_list)',
          '--supplemental-dependency-file',
-         '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+         '<(SHARED_INTERMEDIATE_DIR)/idl_dependencies.tmp',
          '--window-constructors-file',
          '<(SHARED_INTERMEDIATE_DIR)/DOMWindowConstructors.idl',
          '<@(write_file_only_if_changed)',
        ],
        'message': 'Resolving partial interfaces dependencies in all IDL files',
       }]
     },
     {
       'target_name': 'bindings_derived_sources',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
-        'supplemental_dependencies',
+        'idl_dependencies',
         '../core/core.gyp/core_derived_sources.gyp:generate_test_support_idls',
       ],
       'sources': [
         '<@(idl_files)',
         '<@(webcore_test_support_idl_files)',
       ],
       'actions': [{
         'action_name': 'derived_sources_all_in_one',
         'inputs': [
           '../core/core.gyp/scripts/action_derivedsourcesallinone.py',
-          '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+          '<(SHARED_INTERMEDIATE_DIR)/idl_dependencies.tmp',
         ],
         'outputs': [
           '<@(derived_sources_aggregate_files)',
         ],
         'action': [
           'python',
           '../core/core.gyp/scripts/action_derivedsourcesallinone.py',
-          '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+          '<(SHARED_INTERMEDIATE_DIR)/idl_dependencies.tmp',
           '--',
           '<@(derived_sources_aggregate_files)',
         ],
       }],
       'rules': [{
         'rule_name': 'binding',
         'extension': 'idl',
         'msvs_external_rule': 1,
         'inputs': [
           'scripts/generate-bindings.pl',
           'scripts/CodeGeneratorV8.pm',
           'scripts/IDLParser.pm',
+          'scripts/InterfaceMerger.pm',
           'scripts/IDLAttributes.txt',
           '../core/scripts/preprocessor.pm',
           '<!@pymod_do_main(supplemental_idl_files <@(idl_files))',
           '<(SHARED_INTERMEDIATE_DIR)/DOMWindowConstructors.idl',
         ],
         'outputs': [
           # FIXME:  The .cpp file should be in webkit/bindings once
           # we coax GYP into supporting it (see 'action' below).
           '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8<(RULE_INPUT_ROOT).cpp',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8<(RULE_INPUT_ROOT).h',
@@ skipping 21 matching lines @@
           'scripts/generate-bindings.pl',
           '--outputHeadersDir',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
           '--outputDir',
           '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings',
           '--idlAttributesFile',
           'scripts/IDLAttributes.txt',
           '--defines',
           '<(feature_defines)',
           '<@(generator_include_dirs)',
-          '--supplementalDependencyFile',
-          '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
+          '--dependenciesFile',
+          '<(SHARED_INTERMEDIATE_DIR)/idl_dependencies.tmp',
           '--additionalIdlFiles',
           '<(webcore_test_support_idl_files)',
           '<(RULE_INPUT_PATH)',
           '<@(preprocessor)',
           '<@(write_file_only_if_changed)',
         ],
         'message': 'Generating binding from <(RULE_INPUT_PATH)',
       }],
     },
   ],
 }