CodeGen: Define new lists for IDL dictionaries

Defines new lists of generated files for IDL dictionaries which are
generated by the new code generator.
Plus, refactors some ambiguous GN variables which were used for
both old/new code generators.

Bug: 839389
Change-Id: I42b603e8e58cc632420620d6f657105b7e5b4691
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2301536Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Commit-Queue: Hitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791728}

third_party/blink/renderer/bindings/BUILD.gn

@@ -207,9 +207,9 @@ template("generate_bindings") {
 if (use_v8_bind_gen_for_dictionary) {
   generate_bindings("generate_bindings_dictionary") {
     targets = [ "dictionary" ]
-    outputs =
-        generated_core_dictionary_files + generated_modules_dictionary_files +
-        generated_core_testing_dictionary_files
+    outputs = generated_dictionary_sources_in_core +
+              generated_dictionary_sources_in_modules +
+              generated_dictionary_sources_for_testing_in_core
   }
 }
 

third_party/blink/renderer/bindings/core/v8/BUILD.gn

@@ -128,10 +128,16 @@ idl_compiler("generate_bindings_core_v8_interfaces") {
 }
 
 aggregate_generated_bindings("generate_bindings_core_v8_all_interfaces") {
-  sources = core_definition_idl_files
-  if (use_v8_bind_gen_for_dictionary) {
-    sources -= core_dictionary_idl_files
+  sources =
+      core_buffer_source_type_idl_files + core_callback_interface_idl_files
+  if (!use_v8_bind_gen_for_dictionary) {
+    sources += core_dictionary_idl_files
+  }
+  if (!use_blink_v8_binding_new_idl_interface) {
+    sources += core_interface_idl_files_core_only +
+               core_interface_idl_files_modules_dependent
   }
+
   outputs = [ "$bindings_core_v8_output_dir/v8_generated_core_bindings.cc" ]
   component = "core"
   public_deps = [ ":generate_bindings_core_v8_interfaces" ]
@@ -152,16 +158,13 @@ idl_impl("bindings_core_impl_generated") {
 
 # Compile the non-test sources generated above.
 blink_core_sources("bindings_core_impl") {
-  _non_testing_sources = get_target_outputs(":bindings_core_impl_generated") -
-                         generated_core_testing_callback_function_files
+  sources = get_target_outputs(":bindings_core_impl_generated") +
+            bindings_core_generated_interface_files -
+            generated_core_testing_callback_function_files
 
-  _non_testing_sources += generated_core_dictionary_files
   if (!use_v8_bind_gen_for_dictionary) {
-    _non_testing_sources -= generated_core_testing_dictionary_files
+    sources -= generated_core_testing_dictionary_files
   }
-
-  sources = _non_testing_sources + bindings_core_generated_interface_files
-
   if (!use_blink_v8_binding_new_idl_interface) {
     sources += get_target_outputs(":bindings_core_origin_trial_features")
   }
@@ -179,20 +182,19 @@ blink_core_sources("bindings_core_impl") {
 jumbo_source_set("testing_internal") {
   testonly = true
 
-  sources = generated_core_testing_dictionary_files +
-            generated_core_testing_callback_function_files
-
-  testing_idl_interface_files =
-      webcore_testing_idl_files + generated_webcore_testing_idl_files +
-      webcore_testing_idl_with_modules_dependency_files
+  sources = generated_core_testing_callback_function_files
   if (!use_v8_bind_gen_for_dictionary) {
-    testing_idl_interface_files += core_testing_dictionary_idl_files
+    sources += generated_core_testing_dictionary_files
   }
 
-  if (use_blink_v8_binding_new_idl_interface) {
-    idl_files = core_testing_dictionary_idl_files
-  } else {
-    idl_files = testing_idl_interface_files
+  idl_files = []
+  if (!use_v8_bind_gen_for_dictionary) {
+    idl_files += core_testing_dictionary_idl_files
+  }
+  if (!use_blink_v8_binding_new_idl_interface) {
+    idl_files +=
+        webcore_testing_idl_files + generated_webcore_testing_idl_files +
+        webcore_testing_idl_with_modules_dependency_files
   }
   sources += process_file_template(
           idl_files,

third_party/blink/renderer/bindings/core/v8/generated.gni

@@ -196,54 +196,28 @@ if (is_win && is_official_build) {
   bindings_core_generated_interface_files =
       [ "$bindings_core_v8_output_dir/v8_generated_core_bindings.cc" ]
 } else {
-  _core_definition_idl_files = core_definition_idl_files
-  if (use_v8_bind_gen_for_dictionary) {
-    _core_definition_idl_files -= core_dictionary_idl_files
+  _idl_files =
+      core_buffer_source_type_idl_files + core_callback_interface_idl_files
+  if (!use_v8_bind_gen_for_dictionary) {
+    _idl_files += core_dictionary_idl_files
+  }
+  if (!use_blink_v8_binding_new_idl_interface) {
+    _idl_files += core_interface_idl_files_core_only +
+                  core_interface_idl_files_modules_dependent
   }
   bindings_core_generated_interface_files =
       process_file_template(
-          _core_definition_idl_files,
-          [
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.cc",
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.h",
-          ])
-}
-if (use_blink_v8_binding_new_idl_interface) {
-  bindings_core_generated_interface_files = []
-  bindings_core_generated_interface_files =
-      process_file_template(
-          core_buffer_source_type_idl_files +
-              core_callback_interface_idl_files + core_dictionary_idl_files,
+          _idl_files,
           [
             "$bindings_core_v8_output_dir/v8_{{source_name_part}}.cc",
             "$bindings_core_v8_output_dir/v8_{{source_name_part}}.h",
           ])
 }
 
-generated_core_dictionary_files = []
-
-if (use_v8_bind_gen_for_dictionary) {
-  generated_core_dictionary_files +=
-      process_file_template(
-          core_dictionary_idl_files,
-          [
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.cc",
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.h",
-          ])
-
-  generated_core_testing_dictionary_files =
-      process_file_template(
-          core_testing_dictionary_idl_files,
-          [
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.cc",
-            "$bindings_core_v8_output_dir/v8_{{source_name_part}}.h",
-          ])
-} else {
-  generated_core_testing_dictionary_files =
-      process_file_template(
-          core_testing_dictionary_idl_files,
-          [
-            "$blink_core_output_dir/testing/{{source_name_part}}.cc",
-            "$blink_core_output_dir/testing/{{source_name_part}}.h",
-          ])
-}
+generated_core_testing_dictionary_files =
+    process_file_template(
+        core_testing_dictionary_idl_files,
+        [
+          "$blink_core_output_dir/testing/{{source_name_part}}.cc",
+          "$blink_core_output_dir/testing/{{source_name_part}}.h",
+        ])

third_party/blink/renderer/bindings/modules/v8/BUILD.gn

@@ -236,8 +236,9 @@ blink_modules_sources("bindings_modules_impl") {
         get_target_outputs(":bindings_modules_v8_generated_init_partial") +
         get_target_outputs(":bindings_modules_origin_trial_features")
   }
-
-  sources += generated_modules_dictionary_files
+  if (use_v8_bind_gen_for_dictionary) {
+    sources += generated_dictionary_sources_in_modules
+  }
 
   deps = [
     ":bindings_modules_origin_trial_features",

third_party/blink/renderer/bindings/modules/v8/generated.gni

@@ -186,15 +186,3 @@ generated_modules_callback_function_files = [
 
 bindings_generated_v8_context_snapshot_external_references_file =
     "$bindings_modules_v8_output_dir/v8_context_snapshot_external_references.cc"
-
-generated_modules_dictionary_files = []
-
-if (use_v8_bind_gen_for_dictionary) {
-  generated_modules_dictionary_files +=
-      process_file_template(
-          modules_dictionary_idl_files,
-          [
-            "$bindings_modules_v8_output_dir/v8_{{source_name_part}}.cc",
-            "$bindings_modules_v8_output_dir/v8_{{source_name_part}}.h",
-          ])
-}