Add support to validate list of items in json5 config.

third_party/WebKit/Source/build/scripts/json5_generator.py

 # Copyright (c) 2017 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.
 
 """Generic generator for configuration files in JSON5 format.
 
 The configuration file is expected to contain either a data array or a data map,
 an optional parameters validation map, and an optional metdata map. Examples:
 {
   data: [
@@ skipping 146 matching lines @@
             if key not in self.parameters:
                 raise Exception(
                     "Unknown parameter: '%s'\nKnown params: %s" %
                     (key, self.parameters.keys()))
             if self.parameters[key]:
                 self._validate_parameter(self.parameters[key], value)
             entry[key] = value
         return entry
 
     def _validate_parameter(self, parameter, value):
-        valid_values = parameter.get("valid_values")
-        if valid_values and value not in valid_values:
-            raise Exception("Unknown value: '%s'\nKnown values: %s" %
-                            (value, valid_values))
         valid_type = parameter.get("valid_type")
         if valid_type and type(value).__name__ != valid_type:
             raise Exception("Incorrect type: '%s'\nExpected type: %s" %
                             (type(value).__name__, valid_type))
+        valid_values = parameter.get("valid_values")
+        if not valid_values:
+            return
+        # If valid_values is a list of simple items and not list of list, then
+        # validate each item in the value list against valid_values.
+        if valid_type == "list" and type(valid_values[0]) is not list:
+            for item in value:
+                if item not in valid_values:
+                    raise Exception("Unknown value: '%s'\nKnown values: %s" %
+                                    (item, valid_values))
+        elif value not in valid_values:
+            raise Exception("Unknown value: '%s'\nKnown values: %s" %
+                            (value, valid_values))
 
 
 class Writer(object):
     # Subclasses should override.
     class_name = None
     default_metadata = None
     default_parameters = None
 
     def __init__(self, json5_files):
         self._outputs = {}  # file_name -> generator
@@ skipping 43 matching lines @@
         parser.add_argument("--developer_dir", help="Path to Xcode.")
         parser.add_argument("--output_dir", default=os.getcwd())
         args = parser.parse_args()
 
         if args.developer_dir:
             os.environ["DEVELOPER_DIR"] = args.developer_dir
 
         writer = self._writer_class(args.files)
         writer.set_gperf_path(args.gperf)
         writer.write_files(args.output_dir)