Revert of Remove more blink modules gypi code.

third_party/WebKit/Source/build/scripts/scripts.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//third_party/WebKit/Source/config.gni")
 
 # All paths in this file should be absolute so targets in any directory can use
 # them without worrying about the current directory.
 _scripts_dir = "//third_party/WebKit/Source/build/scripts"
 
@@ skipping 76 matching lines @@
 #   script: script to run.
 #   in_files: ".in" files to pass to the script
 #   other_inputs: (optional) other input files the script depends on
 #                 defaults to "scripts_for_in_files" (if specified, we assume
 #                 that the contents of "scripts_for_in_files" are included in
 #                 this list specified since this is how these lists are filled
 #                 from the GYP build.
 #   outputs: expected results. Note that the directory of the 0th item in this
 #            list will be taken to be the output path.
 #   other_args: (optional) other arguments to pass to the script.
-#   deps [optional]:
-#     Depenendencies. If unspecified defaults to make_core_generated_deps.
+#   deps [optional]: additional depenendencies
 template("process_in_files") {
   action(target_name) {
     script = invoker.script
 
     inputs = invoker.in_files
     if (defined(invoker.other_inputs)) {
       inputs += invoker.other_inputs
     } else {
       inputs += scripts_for_in_files
     }
     outputs = invoker.outputs
 
     # Extract the directory to write files to.
     output_dir = get_path_info(outputs[0], "dir")
 
     args = rebase_path(invoker.in_files, root_build_dir) + [
              "--output_dir",
              rebase_path(output_dir, root_build_dir),
            ]
     if (defined(invoker.other_args)) {
       args += invoker.other_args
     }
 
+    deps = make_core_generated_deps
     if (defined(invoker.deps)) {
-      deps = invoker.deps
-    } else {
-      deps = make_core_generated_deps
+      deps += invoker.deps
     }
-    forward_variables_from(invoker, [ "visibility" ])
   }
 }
 
 # Template for scripts using css_properties.py. This is a special case of
 # process_in_files.
 #   outputs: expected results
 template("css_properties") {
   process_in_files(target_name) {
     script = invoker.script
     in_files = [ "css/CSSProperties.in" ]
     other_inputs = css_properties_files
     if (defined(invoker.other_inputs)) {
       other_inputs += invoker.other_inputs
     }
     other_args = [
       "--gperf",
       gperf_exe,
     ]
     outputs = invoker.outputs
   }
 }
 
 # Template to run the make_names script. This is a special case of
 # process_in_files.
 #   in_files: files to pass to the script
 #   outputs: expected results
-#   deps [optional]:
-#     Dependencies. See process_in_files for definition.
+#   deps [optional]: additional dependencies
 template("make_names") {
   process_in_files(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_names.py"
+    in_files = invoker.in_files
     other_inputs = make_names_files
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "in_files",
-                             "outputs",
-                             "public_deps",
-                             "visibility",
-                           ])
+    outputs = invoker.outputs
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }
 
 # Template to run the make_qualified_names script. This is a special case of
 # process_in_files.
 #   in_files: list of ".in" files to process.
 #   outputs: list of output files
 template("make_qualified_names") {
   process_in_files(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_qualified_names.py"
     in_files = invoker.in_files
     other_inputs = make_qualified_names_files
     outputs = invoker.outputs
   }
 }
 
 # Calls the make_event_factory script. This is a special case of
 # process_in_files.
 #   in_files: list of ".in" files to process.
 #   outputs: list of output files
-#   deps [optional]
-#     Dependencies. See process_in_files for definition.
+#   deps [optional]: additional depenendencies
 template("make_event_factory") {
   process_in_files(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_event_factory.py"
+    in_files = invoker.in_files
     other_inputs = make_event_factory_files
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "in_files",
-                             "outputs",
-                             "visibility",
-                           ])
+    outputs = invoker.outputs
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }
 
 # Calls the make_token_matcher script.
 #   input_file: The "*-in.cpp" file
 #   output_file: The output file
 template("make_token_matcher") {
   action(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_token_matcher.py"
 
     inputs = scripts_for_in_files + [ invoker.input_file ]
     outputs = [
       invoker.output_file,
     ]
 
     args = [
       rebase_path(invoker.input_file, root_build_dir),
       rebase_path(invoker.output_file, root_build_dir),
     ]
 
     deps = make_core_generated_deps
   }
 }