Chromium Code Reviews| Index: components/json_schema/json_schema_validator.h |
| diff --git a/components/json_schema/json_schema_validator.h b/components/json_schema/json_schema_validator.h |
| index 4e8acaddfd983c68b10c02f126e29b6a498cc2ab..b50de316703aca3dffd1802009ec4206d9645464 100644 |
| --- a/components/json_schema/json_schema_validator.h |
| +++ b/components/json_schema/json_schema_validator.h |
| @@ -32,7 +32,6 @@ class Value; |
| // - disallow |
| // - union types (but replaced with 'choices') |
| // - number.maxDecimal |
| -// - string.pattern |
| // |
| // The following properties are not applicable to the interface exposed by |
| // this class: |
| @@ -52,6 +51,8 @@ class Value; |
| // - by default an "object" typed schema does not allow additional properties. |
| // if present, "additionalProperties" is to be a schema against which all |
| // additional properties will be validated. |
| +// - regular expression supports all syntaxes that re2 accepts. |
| +// See https://code.google.com/p/re2/wiki/Syntax for details. |
| //============================================================================== |
| class JSONSchemaValidator { |
| public: |
| @@ -92,6 +93,7 @@ class JSONSchemaValidator { |
| static const char kNumberMaximum[]; |
| static const char kInvalidType[]; |
| static const char kInvalidTypeIntegerNumber[]; |
| + static const char kInvalidRegex[]; |
| // Classifies a Value as one of the JSON schema primitive types. |
| static std::string GetJSONSchemaType(const base::Value* value); |
| @@ -110,6 +112,9 @@ class JSONSchemaValidator { |
| // and that DictionaryValue can be used to build a JSONSchemaValidator. |
| // Returns the parsed DictionaryValue when |schema| validated, otherwise |
| // returns NULL. In that case, |error| contains an error description. |
| + // For performance reason, currently IsValidSchema() won't check the |
|
Joao da Silva
2014/03/21 10:15:16
For performance reasons
binjin
2014/03/21 14:57:43
Done.
|
| + // correctness of regular expression used in "pattern" and "patternProperties" |
|
Joao da Silva
2014/03/21 10:15:16
of regular expressions
binjin
2014/03/21 14:57:43
Done.
|
| + // and in Validate() invalid regular expression don't accepts any strings. |
|
Joao da Silva
2014/03/21 10:15:16
don't accept
binjin
2014/03/21 14:57:43
Done.
|
| static scoped_ptr<base::DictionaryValue> IsValidSchema( |
| const std::string& schema, |
| std::string* error); |