Index: mojo/public/cpp/bindings/lib/string_traits_wtf.cc |
diff --git a/mojo/public/cpp/bindings/lib/string_traits_wtf.cc b/mojo/public/cpp/bindings/lib/string_traits_wtf.cc |
index 401a7b7a6bd8e0d9862f346aac3d266305f136a7..19fa907448301f65ebddca5ef98f49449f0f6877 100644 |
--- a/mojo/public/cpp/bindings/lib/string_traits_wtf.cc |
+++ b/mojo/public/cpp/bindings/lib/string_traits_wtf.cc |
@@ -43,6 +43,15 @@ UTF8AdaptorInfo* ToAdaptor(const WTF::String& input, void* context) { |
} // namespace |
// static |
+void StringTraits<WTF::String>::SetToNull(WTF::String* output) { |
+ if (output->isNull()) |
+ return; |
+ |
+ WTF::String result; |
+ output->swap(result); |
+} |
+ |
+// static |
void* StringTraits<WTF::String>::SetUpContext(const WTF::String& input) { |
return new UTF8AdaptorInfo(input); |
} |
@@ -68,13 +77,8 @@ const char* StringTraits<WTF::String>::GetData(const WTF::String& input, |
// static |
bool StringTraits<WTF::String>::Read(StringDataView input, |
WTF::String* output) { |
- if (!input.is_null()) { |
- WTF::String result = WTF::String::fromUTF8(input.storage(), input.size()); |
- output->swap(result); |
- } else if (!output->isNull()) { |
- WTF::String result; |
- output->swap(result); |
- } |
+ WTF::String result = WTF::String::fromUTF8(input.storage(), input.size()); |
+ output->swap(result); |
return true; |
} |