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

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

 {
   'includes': [
     '../../../../WebKit/chromium/features.gypi',
     '../../../WebCore.gypi',
     'overrides.gypi',
   ],
   'variables': {
     'dart_dir': '../../../../../../../dart',
     'dart_client_dir': '<(dart_dir)/client',
     'dom_common_dir': '<(dart_client_dir)/dom/common',
@@ skipping 118 matching lines @@
     },
     {
       'target_name': 'dart_generated_sources',
       'type': 'none',
       'hard_dependency': 1,
       'sources': [
         '<@(bindings_idl_files)',
       ],
       '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',
             '<(webcore_dir)/html/HTMLTagNames.in',
             '<(webcore_dir)/html/HTMLAttributeNames.in',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/tmp/HTMLNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/tmp/HTMLNames.h',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/tmp/HTMLElementFactory.cpp',
@@ skipping 77 matching lines @@
           ],
           'action': [
             'python',
             'scripts/massage_factories.py',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/tmp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
             'SVG'
           ],
         },
       ],
-      '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',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'dart_generated_sources',
         '<(dart_dir)/runtime/dart-runtime.gyp:gen_snapshot',
       ],
       'variables': {
@@ skipping 14 matching lines @@
           'inputs': [
             'scripts/build_dart_snapshot.py',
             'scripts/CodeGeneratorDart.pm',
             '<(idls_list_temp_file)',
             '<@(bindings_idl_files)',
 
             '<(dart_scripts_dir)/fremontcutbuilder.py',
             '<(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',
 
             '<(dart_auxiliary_dir)/DOMType.dart',
             '<(dart_auxiliary_dir)/DOMWrapperBase.dart',
             '<(dart_auxiliary_dir)/EventListener.dart',
             '<(dart_auxiliary_dir)/frog_FactoryProviders.dart',
             '<(dart_auxiliary_dir)/GlobalProperties.dart',
             '<(dart_auxiliary_dir)/KeyLocation.dart',
             '<(dart_auxiliary_dir)/KeyName.dart',
             '<(dart_auxiliary_dir)/native_DOMImplementation.dart',
             '<(dart_auxiliary_dir)/native_DOMPublic.dart',
             '<(dart_auxiliary_dir)/native_DOMWrapperBase.dart',
             '<(dart_auxiliary_dir)/native_FactoryProviders.dart',
             '<(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',
             '<(dart_auxiliary_dir)/_ListIterators.dart',
             '<(dart_auxiliary_dir)/_Lists.dart',
 
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen_snapshot<(EXECUTABLE_SUFFIX)',
           ],
           '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',
             'scripts/build_dart_snapshot.py',
             '<(idls_list_temp_file)',
             '<(dart_dir)',
             '<(resources_dir)/DartSnapshot.bytes.template',
             '<(output_path)',
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen_snapshot<(EXECUTABLE_SUFFIX)',
             '<(feature_defines)',
           ],
         },
       ],
     },
   ],
 }