OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/json/json_string_value_serializer.h" | 5 #include "base/json/json_string_value_serializer.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 int options = 0; | 34 int options = 0; |
35 if (omit_binary_values) | 35 if (omit_binary_values) |
36 options |= base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES; | 36 options |= base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES; |
37 if (pretty_print_) | 37 if (pretty_print_) |
38 options |= base::JSONWriter::OPTIONS_PRETTY_PRINT; | 38 options |= base::JSONWriter::OPTIONS_PRETTY_PRINT; |
39 | 39 |
40 return base::JSONWriter::WriteWithOptions(root, options, json_string_); | 40 return base::JSONWriter::WriteWithOptions(root, options, json_string_); |
41 } | 41 } |
42 | 42 |
43 JSONStringValueDeserializer::JSONStringValueDeserializer( | 43 JSONStringValueDeserializer::JSONStringValueDeserializer( |
44 const base::StringPiece& json_string) | 44 const base::StringPiece& json_string, |
45 : json_string_(json_string), | 45 int options) |
46 allow_trailing_comma_(false) { | 46 : json_string_(json_string), options_(options) {} |
47 } | |
48 | 47 |
49 JSONStringValueDeserializer::~JSONStringValueDeserializer() {} | 48 JSONStringValueDeserializer::~JSONStringValueDeserializer() {} |
50 | 49 |
51 std::unique_ptr<Value> JSONStringValueDeserializer::Deserialize( | 50 std::unique_ptr<Value> JSONStringValueDeserializer::Deserialize( |
52 int* error_code, | 51 int* error_code, |
53 std::string* error_str) { | 52 std::string* error_str) { |
54 return base::JSONReader::ReadAndReturnError( | 53 return base::JSONReader::ReadAndReturnError(json_string_, options_, |
55 json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS | 54 error_code, error_str); |
56 : base::JSON_PARSE_RFC, | |
57 error_code, error_str); | |
58 } | 55 } |
OLD | NEW |