Commit 129a7d15 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Reformat all gn files in /third_party/blink/renderer/bindings.

`gn format` recently changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.

Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.

This CL was uploaded by git cl split.

R=yukishiino@chromium.org

Bug: 1041419
Change-Id: I926ff640e20ceaf71e614fa0b3c790ced28a9e39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998390
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731170}
parent bf7a6d7a
...@@ -18,9 +18,7 @@ action("interfaces_info") { ...@@ -18,9 +18,7 @@ action("interfaces_info") {
"$bindings_core_output_dir/interfaces_info_core.pickle", "$bindings_core_output_dir/interfaces_info_core.pickle",
"$bindings_modules_output_dir/interfaces_info_modules.pickle", "$bindings_modules_output_dir/interfaces_info_modules.pickle",
] ]
outputs = [ outputs = [ "$bindings_output_dir/interfaces_info.pickle" ]
"$bindings_output_dir/interfaces_info.pickle",
]
args = [ args = [
"--", "--",
...@@ -56,9 +54,7 @@ template("collect_idl_files") { ...@@ -56,9 +54,7 @@ template("collect_idl_files") {
script = "${bindings_scripts_dir}/collect_idl_files.py" script = "${bindings_scripts_dir}/collect_idl_files.py"
inputs = invoker.inputs inputs = invoker.inputs
outputs = [ outputs = [ invoker.output ]
invoker.output,
]
# List input file names in a temporary file. # List input file names in a temporary file.
response_file_contents = rebase_path(inputs, root_build_dir) response_file_contents = rebase_path(inputs, root_build_dir)
...@@ -122,9 +118,7 @@ action_with_pydeps("web_idl_database") { ...@@ -122,9 +118,7 @@ action_with_pydeps("web_idl_database") {
runtime_enabled_features_test_file, runtime_enabled_features_test_file,
] ]
output_data_file = "${bindings_output_dir}/web_idl_database.pickle" output_data_file = "${bindings_output_dir}/web_idl_database.pickle"
outputs = [ outputs = [ output_data_file ]
output_data_file,
]
args = [ args = [
"--output", "--output",
...@@ -156,9 +150,7 @@ if (use_v8_bind_gen_for_dictionary) { ...@@ -156,9 +150,7 @@ if (use_v8_bind_gen_for_dictionary) {
web_idl_database_outputs = get_target_outputs(":web_idl_database") web_idl_database_outputs = get_target_outputs(":web_idl_database")
web_idl_database = web_idl_database_outputs[0] web_idl_database = web_idl_database_outputs[0]
inputs = [ inputs = [ web_idl_database ]
web_idl_database,
]
outputs = outputs =
generated_core_dictionary_files + generated_modules_dictionary_files + generated_core_dictionary_files + generated_modules_dictionary_files +
generated_core_testing_dictionary_files + generated_demo_files generated_core_testing_dictionary_files + generated_demo_files
...@@ -177,9 +169,7 @@ if (use_v8_bind_gen_for_dictionary) { ...@@ -177,9 +169,7 @@ if (use_v8_bind_gen_for_dictionary) {
rebase_path("${bindings_output_dir}/modules/v8/", root_gen_dir), rebase_path("${bindings_output_dir}/modules/v8/", root_gen_dir),
] ]
deps = [ deps = [ ":web_idl_database" ]
":web_idl_database",
]
} }
} }
...@@ -189,13 +179,9 @@ action_with_pydeps("generate_high_entropy_list") { ...@@ -189,13 +179,9 @@ action_with_pydeps("generate_high_entropy_list") {
web_idl_database_outputs = get_target_outputs(":web_idl_database") web_idl_database_outputs = get_target_outputs(":web_idl_database")
web_idl_database = web_idl_database_outputs[0] web_idl_database = web_idl_database_outputs[0]
inputs = [ inputs = [ web_idl_database ]
web_idl_database,
]
output_data_file = "${bindings_output_dir}/high_entropy_list.txt" output_data_file = "${bindings_output_dir}/high_entropy_list.txt"
outputs = [ outputs = [ output_data_file ]
output_data_file,
]
args = [ args = [
"--web_idl_database", "--web_idl_database",
...@@ -204,7 +190,5 @@ action_with_pydeps("generate_high_entropy_list") { ...@@ -204,7 +190,5 @@ action_with_pydeps("generate_high_entropy_list") {
rebase_path(output_data_file, root_build_dir), rebase_path(output_data_file, root_build_dir),
] ]
deps = [ deps = [ ":web_idl_database" ]
":web_idl_database",
]
} }
...@@ -34,7 +34,5 @@ generate_global_constructors("core_global_constructors_idls") { ...@@ -34,7 +34,5 @@ generate_global_constructors("core_global_constructors_idls") {
basenames = core_global_constructors_original_interface_basenames basenames = core_global_constructors_original_interface_basenames
component = "core" component = "core"
output_dir = blink_core_output_dir output_dir = blink_core_output_dir
deps = [ deps = [ ":core_global_objects" ]
":core_global_objects",
]
} }
...@@ -53,13 +53,9 @@ aggregate_generated_bindings("generate_bindings_core_v8_all_interfaces") { ...@@ -53,13 +53,9 @@ aggregate_generated_bindings("generate_bindings_core_v8_all_interfaces") {
if (use_v8_bind_gen_for_dictionary) { if (use_v8_bind_gen_for_dictionary) {
sources -= core_dictionary_idl_files sources -= core_dictionary_idl_files
} }
outputs = [ outputs = [ "$bindings_core_v8_output_dir/v8_generated_core_bindings.cc" ]
"$bindings_core_v8_output_dir/v8_generated_core_bindings.cc",
]
component = "core" component = "core"
public_deps = [ public_deps = [ ":generate_bindings_core_v8_interfaces" ]
":generate_bindings_core_v8_interfaces",
]
} }
idl_impl("bindings_core_impl_generated") { idl_impl("bindings_core_impl_generated") {
...@@ -117,9 +113,7 @@ jumbo_source_set("testing") { ...@@ -117,9 +113,7 @@ jumbo_source_set("testing") {
} }
fuzzer_test("v8_serialized_script_value_fuzzer") { fuzzer_test("v8_serialized_script_value_fuzzer") {
sources = [ sources = [ "serialization/serialized_script_value_fuzzer.cc" ]
"serialization/serialized_script_value_fuzzer.cc",
]
seed_corpus = "serialization/fuzz_corpus" seed_corpus = "serialization/fuzz_corpus"
deps = [ deps = [
"//third_party/blink/renderer/core", "//third_party/blink/renderer/core",
......
...@@ -86,9 +86,7 @@ generate_event_interfaces("modules_bindings_generated_event_interfaces") { ...@@ -86,9 +86,7 @@ generate_event_interfaces("modules_bindings_generated_event_interfaces") {
make_event_factory("event_modules") { make_event_factory("event_modules") {
visibility = [ ":*" ] visibility = [ ":*" ]
in_files = [ "$blink_modules_output_dir/event_interface_modules_names.json5" ] in_files = [ "$blink_modules_output_dir/event_interface_modules_names.json5" ]
outputs = [ outputs = [ "$blink_modules_output_dir/event_modules_factory.cc" ]
"$blink_modules_output_dir/event_modules_factory.cc",
]
deps = make_core_generated_deps + [ "//third_party/blink/renderer/bindings/modules:modules_bindings_generated_event_interfaces" ] deps = make_core_generated_deps + [ "//third_party/blink/renderer/bindings/modules:modules_bindings_generated_event_interfaces" ]
} }
...@@ -126,9 +124,7 @@ compute_global_objects("modules_global_objects") { ...@@ -126,9 +124,7 @@ compute_global_objects("modules_global_objects") {
sources = modules_idl_files sources = modules_idl_files
sources_generated = [ "$bindings_core_output_dir/global_objects_core.pickle" ] sources_generated = [ "$bindings_core_output_dir/global_objects_core.pickle" ]
output_file = "$bindings_modules_output_dir/global_objects_modules.pickle" output_file = "$bindings_modules_output_dir/global_objects_modules.pickle"
deps = [ deps = [ "//third_party/blink/renderer/bindings/core:core_global_objects" ]
"//third_party/blink/renderer/bindings/core:core_global_objects",
]
} }
generate_global_constructors("modules_global_constructors_idls") { generate_global_constructors("modules_global_constructors_idls") {
...@@ -139,9 +135,7 @@ generate_global_constructors("modules_global_constructors_idls") { ...@@ -139,9 +135,7 @@ generate_global_constructors("modules_global_constructors_idls") {
basenames = modules_global_constructors_original_interface_basenames basenames = modules_global_constructors_original_interface_basenames
component = "modules" component = "modules"
output_dir = blink_modules_output_dir output_dir = blink_modules_output_dir
deps = [ deps = [ ":modules_global_objects" ]
":modules_global_objects",
]
} }
# Compile the sources produced above. This will get linked into "modules". # Compile the sources produced above. This will get linked into "modules".
......
...@@ -73,12 +73,8 @@ generate_origin_trial_features("bindings_modules_origin_trial_features") { ...@@ -73,12 +73,8 @@ generate_origin_trial_features("bindings_modules_origin_trial_features") {
action("bindings_modules_v8_generated_init_partial") { action("bindings_modules_v8_generated_init_partial") {
script = "$bindings_scripts_dir/generate_init_partial_interfaces.py" script = "$bindings_scripts_dir/generate_init_partial_interfaces.py"
inputs = [ inputs = [ "$bindings_output_dir/interfaces_info.pickle" ]
"$bindings_output_dir/interfaces_info.pickle", outputs = [ bindings_modules_generated_init_partial_interfaces_file ]
]
outputs = [
bindings_modules_generated_init_partial_interfaces_file,
]
# Put the IDL file list in a response file to avoid command-line limits. # Put the IDL file list in a response file to avoid command-line limits.
response_file_contents = response_file_contents =
...@@ -92,9 +88,7 @@ action("bindings_modules_v8_generated_init_partial") { ...@@ -92,9 +88,7 @@ action("bindings_modules_v8_generated_init_partial") {
root_build_dir), root_build_dir),
] ]
deps = [ deps = [ "//third_party/blink/renderer/bindings:interfaces_info" ]
"//third_party/blink/renderer/bindings:interfaces_info",
]
} }
# Note that this intentionally depends on the generator target of the mojom # Note that this intentionally depends on the generator target of the mojom
...@@ -149,9 +143,7 @@ action("generate_v8_context_snapshot_external_references") { ...@@ -149,9 +143,7 @@ action("generate_v8_context_snapshot_external_references") {
output = bindings_generated_v8_context_snapshot_external_references_file output = bindings_generated_v8_context_snapshot_external_references_file
inputs = idl_files + [ script ] inputs = idl_files + [ script ]
outputs = [ outputs = [ output ]
output,
]
response_file_contents = rebase_path(idl_files, root_build_dir) response_file_contents = rebase_path(idl_files, root_build_dir)
args = [ args = [
......
...@@ -37,9 +37,7 @@ action("cached_jinja_templates") { ...@@ -37,9 +37,7 @@ action("cached_jinja_templates") {
# Dummy file to track dependency. # Dummy file to track dependency.
stamp_file = "$bindings_scripts_output_dir/cached_jinja_templates.stamp" stamp_file = "$bindings_scripts_output_dir/cached_jinja_templates.stamp"
outputs = [ outputs = [ stamp_file ]
stamp_file,
]
args = [ args = [
rebase_path(bindings_scripts_output_dir, root_build_dir), rebase_path(bindings_scripts_output_dir, root_build_dir),
......
...@@ -125,9 +125,7 @@ template("generate_event_interfaces") { ...@@ -125,9 +125,7 @@ template("generate_event_interfaces") {
output_file = output_file =
"$root_gen_dir/third_party/blink/renderer/" + invoker.output_file "$root_gen_dir/third_party/blink/renderer/" + invoker.output_file
outputs = [ outputs = [ output_file ]
output_file,
]
script = "//third_party/blink/renderer/bindings/scripts/generate_event_interfaces.py" script = "//third_party/blink/renderer/bindings/scripts/generate_event_interfaces.py"
args = [ args = [
...@@ -342,9 +340,7 @@ template("compute_global_objects") { ...@@ -342,9 +340,7 @@ template("compute_global_objects") {
idl_files_list, idl_files_list,
] + invoker.sources_generated + invoker.sources ] + invoker.sources_generated + invoker.sources
outputs = [ outputs = [ invoker.output_file ]
invoker.output_file,
]
args = [ args = [
"--idl-files-list", "--idl-files-list",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment