| Index: base/json/json_parser.cc
|
| diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
|
| index 0cb59ee4947e42da3e5c60f7a85c08b21ddbf17b..00a6a63f21fa748b99cd9afa9d83eef138187113 100644
|
| --- a/base/json/json_parser.cc
|
| +++ b/base/json/json_parser.cc
|
| @@ -208,7 +208,10 @@ JSONParser::~JSONParser() {
|
| Value* JSONParser::Parse(const StringPiece& input) {
|
| // TODO(rsesek): Windows has problems with StringPiece/hidden roots. Fix
|
| // <http://crbug.com/126107> when my Windows box arrives.
|
| -#if defined(OS_WIN)
|
| + // For Android, swapping string doesn't mean swapping internal pointers
|
| + // but swapping contents. Since it can't provide the performance gain,
|
| + // set the below flag to disable the optimization and make it work.
|
| +#if defined(OS_WIN) || defined(OS_ANDROID)
|
| options_ |= JSON_DETACHABLE_CHILDREN;
|
| #endif
|
|
|
|
|