| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_reader.h" | 5 #include "base/json/json_reader.h" |
| 6 | 6 |
| 7 #include "base/float_util.h" | 7 #include "base/float_util.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 | 14 |
| 15 namespace base { | 15 namespace base { |
| 16 | 16 |
| 17 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN, | 17 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN, |
| 18 0, 0); | 18 0, 0); |
| 19 static const int kStackLimit = 100; | 19 static const int kStackLimit = 100; |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 ++column_number; | 664 ++column_number; |
| 665 } | 665 } |
| 666 } | 666 } |
| 667 | 667 |
| 668 error_line_ = line_number; | 668 error_line_ = line_number; |
| 669 error_col_ = column_number; | 669 error_col_ = column_number; |
| 670 error_code_ = error; | 670 error_code_ = error; |
| 671 } | 671 } |
| 672 | 672 |
| 673 } // namespace base | 673 } // namespace base |
| OLD | NEW |