Switch to dartgenerator.py for C++ callbacks generation.

Source/WebCore/bindings/dart/gyp/dartium.gyp

Index: Source/WebCore/bindings/dart/gyp/dartium.gyp
diff --git a/Source/WebCore/bindings/dart/gyp/dartium.gyp b/Source/WebCore/bindings/dart/gyp/dartium.gyp
index 7ebec15ceab1b568f201ce43d4dc50fecae1e579..123b533efbdcd5c454a9ad4e8dc15a8225b6f431 100644
--- a/Source/WebCore/bindings/dart/gyp/dartium.gyp
+++ b/Source/WebCore/bindings/dart/gyp/dartium.gyp
@@ -136,29 +136,6 @@
       ],
       'actions': [
         {
-          'action_name': 'dart_derived_sources_all_in_one',
-          'variables': {
-            # Write sources into a file, so that the action command line won't
-            # exceed OS limites.
-            'idls_list_temp_file': '<|(idls_list_temp_file.tmp <@(bindings_idl_files))',
-          },
-          'inputs': [
-            'scripts/dart_action_derivedsourcesallinone.py',
-            '<(idls_list_temp_file)',
-            '<@(bindings_idl_files)',
-          ],
-          'outputs': [
-            '<@(additional_derived_sources_aggregate_files)',
-          ],
-          'action': [
-            'python',
-            'scripts/dart_action_derivedsourcesallinone.py',
-            '<(idls_list_temp_file)',
-            '--',
-            '<@(additional_derived_sources_aggregate_files)',
-          ],
-        },
-        {
           'action_name': 'V8HTMLNames',
           'inputs': [
             '<(webcore_dir)/dom/make_names.pl',
@@ -256,69 +233,6 @@
           ],
         },
       ],
-      'rules': [
-        {
-          'rule_name': 'dart_binding',
-          'extension': 'idl',
-          'msvs_external_rule': 1,
-          'inputs': [
-            '<(scripts_dir)/generate-bindings.pl',
-            '<(scripts_dir)/CodeGenerator.pm',
-            'scripts/CodeGeneratorDart.pm',
-            '<(scripts_dir)/IDLParser.pm',
-            '<(scripts_dir)/IDLStructure.pm',
-            '<(scripts_dir)/preprocessor.pm',
-          ],
-          '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/Dart<(RULE_INPUT_ROOT).cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/Dart<(RULE_INPUT_ROOT).h',
-          ],
-          'variables': {
-            'generator_include_dirs': [
-              '--include', '<(webcore_dir)/css',
-              '--include', '<(webcore_dir)/dom',
-              '--include', '<(webcore_dir)/fileapi',
-              '--include', '<(webcore_dir)/html',
-              '--include', '<(webcore_dir)/mediastream',
-              '--include', '<(webcore_dir)/notifications',
-              '--include', '<(webcore_dir)/page',
-              '--include', '<(webcore_dir)/plugins',
-              '--include', '<(webcore_dir)/storage',
-              '--include', '<(webcore_dir)/svg',
-              '--include', '<(webcore_dir)/testing',
-              '--include', '<(webcore_dir)/webaudio',
-              '--include', '<(webcore_dir)/websockets',
-              '--include', '<(webcore_dir)/workers',
-              '--include', '<(webcore_dir)/xml',
-            ],
-          },
-          # FIXME:  Note that we put the .cpp files in webcore/bindings
-          # but the .h files in webkit/bindings.  This is to work around
-          # the unfortunate fact that GYP strips duplicate arguments
-          # from lists.  When we have a better GYP way to suppress that
-          # behavior, change the output location.
-          'action': [
-            'perl',
-            '-w',
-            '-I<(webcore_gyp_dir)/../bindings/scripts',
-            '-Iscripts',
-            '<(webcore_gyp_dir)/../bindings/scripts/generate-bindings.pl',
-            '--outputHeadersDir',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
-            '--outputDir',
-            '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings',
-            '--defines',
-            '<(feature_defines) LANGUAGE_JAVASCRIPT LANGUAGE_DART',
-            '--generator',
-            'Dart',
-            '<@(generator_include_dirs)',
-            '<(RULE_INPUT_PATH)',
-          ],
-          'message': 'Generating Dart binding from <(RULE_INPUT_PATH)',
-        },
-      ],
     },
     {
       'target_name': 'dart_snapshot',
@@ -353,6 +267,12 @@
             '<(dart_scripts_dir)/dartdomgenerator.py',
             '<(dart_scripts_dir)/dartgenerator.py',
 
+            '<(dart_templates_dir)/cpp_all_in_one.template',
+            '<(dart_templates_dir)/cpp_callback_header.template',
+            '<(dart_templates_dir)/cpp_callback_implementation.template',
+            '<(dart_templates_dir)/cpp_header.template',
+            '<(dart_templates_dir)/cpp_implementation.template',
+            '<(dart_templates_dir)/cpp_resolver.template',
             '<(dart_templates_dir)/dart_implementation.darttemplate',
             '<(dart_templates_dir)/dom_public.darttemplate',
             '<(dart_templates_dir)/dom_impl.darttemplate',
@@ -371,7 +291,6 @@
             '<(dart_auxiliary_dir)/native_FactoryProvidersImplementation.dart',
             '<(dart_auxiliary_dir)/native_GlobalProperties.dart',
             '<(dart_auxiliary_dir)/ReadyState.dart',
-            '<(dart_auxiliary_dir)/RequestAnimationFrameCallback.dart',
             '<(dart_auxiliary_dir)/TimeoutHandler.dart',
             '<(dart_auxiliary_dir)/_Collections.dart',
             '<(dart_auxiliary_dir)/_FactoryProviders.dart',
@@ -383,6 +302,10 @@
           'outputs': [
             '<(output_path)/DartSnapshot.bytes',
             '<(output_path)/DartResolver.cpp',
+            '<(output_path)/generated/DartDerivedSourcesAll.cpp',
+            '<(output_path)/generated/DartResolver.cpp',
+            '<(output_path)/generated/dom_impl.dart',
+            '<(output_path)/generated/dom_public.dart',
           ],
           'action': [
             'python',