Index: mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
index e8e92460cd67b41997d02a291f39b2b6df60a53e..7421abcd787e0b370a25296e67053ca7ffdaf5a0 100644 |
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
+++ b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
@@ -1,19 +1,14 @@ |
{%- import "struct_macros.tmpl" as struct_macros %} |
{%- set mojom_type = struct|get_qualified_name_for_kind %} |
-{%- set data_type = struct|get_qualified_name_for_kind(internal=True) %} |
// static |
-bool StructTraits<{{mojom_type}}, {{mojom_type}}Ptr>::ReadFromDataView( |
+bool StructTraits<{{mojom_type}}, {{mojom_type}}Ptr>::Read( |
{{mojom_type}}DataView input, |
{{mojom_type}}Ptr* output) { |
bool success = true; |
- if (!input.is_null()) { |
- {{mojom_type}}Ptr result({{mojom_type}}::New()); |
- {{struct_macros.deserialize(struct, "input", "result->%s", |
- "success")|indent(4)}} |
- *output = std::move(result); |
- } else { |
- output->reset(); |
- } |
+ {{mojom_type}}Ptr result({{mojom_type}}::New()); |
+ {{struct_macros.deserialize(struct, "input", "result->%s", |
+ "success")|indent(4)}} |
+ *output = std::move(result); |
return success; |
} |