Index: third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc |
diff --git a/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc b/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc |
index 94d2ab7a4895877dec87050fff5df16a5bfa3bdd..b84210c10b9a43b098e6f7b32d187e4269ee47e8 100644 |
--- a/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc |
+++ b/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc |
@@ -46,6 +46,7 @@ namespace util { |
namespace converter { |
using strings::ArrayByteSource; |
+; |
JsonObjectWriter::~JsonObjectWriter() { |
if (!element_->is_root()) { |
@@ -81,13 +82,11 @@ JsonObjectWriter* JsonObjectWriter::EndList() { |
return this; |
} |
-JsonObjectWriter* JsonObjectWriter::RenderBool(StringPiece name, |
- bool value) { |
+JsonObjectWriter* JsonObjectWriter::RenderBool(StringPiece name, bool value) { |
return RenderSimple(name, value ? "true" : "false"); |
} |
-JsonObjectWriter* JsonObjectWriter::RenderInt32(StringPiece name, |
- int32 value) { |
+JsonObjectWriter* JsonObjectWriter::RenderInt32(StringPiece name, int32 value) { |
return RenderSimple(name, SimpleItoa(value)); |
} |
@@ -96,8 +95,7 @@ JsonObjectWriter* JsonObjectWriter::RenderUint32(StringPiece name, |
return RenderSimple(name, SimpleItoa(value)); |
} |
-JsonObjectWriter* JsonObjectWriter::RenderInt64(StringPiece name, |
- int64 value) { |
+JsonObjectWriter* JsonObjectWriter::RenderInt64(StringPiece name, int64 value) { |
WritePrefix(name); |
WriteChar('"'); |
stream_->WriteString(SimpleItoa(value)); |
@@ -124,8 +122,7 @@ JsonObjectWriter* JsonObjectWriter::RenderDouble(StringPiece name, |
return RenderString(name, DoubleAsString(value)); |
} |
-JsonObjectWriter* JsonObjectWriter::RenderFloat(StringPiece name, |
- float value) { |
+JsonObjectWriter* JsonObjectWriter::RenderFloat(StringPiece name, float value) { |
if (MathLimits<float>::IsFinite(value)) { |
return RenderSimple(name, SimpleFtoa(value)); |
} |
@@ -148,7 +145,12 @@ JsonObjectWriter* JsonObjectWriter::RenderBytes(StringPiece name, |
StringPiece value) { |
WritePrefix(name); |
string base64; |
- Base64Escape(value, &base64); |
+ |
+ if (use_websafe_base64_for_bytes_) |
+ WebSafeBase64Escape(value.ToString(), &base64); |
+ else |
+ Base64Escape(value, &base64); |
+ |
WriteChar('"'); |
// TODO(wpoon): Consider a ByteSink solution that writes the base64 bytes |
// directly to the stream, rather than first putting them |