Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1635)

Unified Diff: mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

Issue 1550733002: Convert Pass()→std::move() in generated Mojo bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
index 73f6c95865fb763d5c2f25440c85fbbae7fb448b..5321d29f1268ec8cf9afc24d62af8956fc91b4cb 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
@@ -75,7 +75,7 @@ void SerializeUnion_({{union.name}}Ptr input, mojo::internal::Buffer* buf,
reinterpret_cast<mojo::internal::Interface_Data*>(
&result->data.f_{{field.name}});
mojo::internal::InterfacePointerToData(
- input_acc.data()->{{field.name}}->Pass(), {{field.name}});
+ std::move(*input_acc.data()->{{field.name}}), {{field.name}});
{%- elif field.kind|is_associated_kind %}
// TODO(yzshen): add seralization logic for associated kinds.
{% else %}
@@ -110,7 +110,7 @@ bool Deserialize_(internal::{{union.name}}_Data* input,
{% elif field.kind|is_any_handle_kind %}
{{field.kind|cpp_wrapper_type}}* {{field.name}} =
reinterpret_cast<{{field.kind|cpp_wrapper_type}}*>(&input->data.f_{{field.name}});
- result->set_{{field.name}}({{field.name}}->Pass());
+ result->set_{{field.name}}(std::move(*{{field.name}}));
{% elif field.kind|is_interface_kind %}
{{field.kind|cpp_wrapper_type}} {{field.name}}_out;
mojo::internal::Interface_Data* {{field.name}}_in =
@@ -118,7 +118,7 @@ bool Deserialize_(internal::{{union.name}}_Data* input,
&input->data.f_{{field.name}});
mojo::internal::InterfaceDataToPointer(
{{field.name}}_in, &{{field.name}}_out);
- result->set_{{field.name}}({{field.name}}_out.Pass());
+ result->set_{{field.name}}(std::move({{field.name}}_out));
{%- elif field.kind|is_associated_kind %}
// TODO(yzshen): add deserialization logic for associated kinds.
{% elif field.kind|is_enum_kind %}
@@ -130,7 +130,7 @@ bool Deserialize_(internal::{{union.name}}_Data* input,
}
{%- endfor %}
}
- *output = result.Pass();
+ *output = std::move(result);
} else {
output->reset();
}

Powered by Google App Engine
This is Rietveld 408576698