Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively.

mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

 {%- set mojom_type = union|get_qualified_name_for_kind %}
 {%- set data_type = union|get_qualified_name_for_kind(internal=True) %}
 
 namespace internal {
 
 // static
 size_t UnionSerializerImpl<{{mojom_type}}Ptr>::PrepareToSerialize(
     {{mojom_type}}Ptr& input,
     bool inlined,
     SerializationContext* context) {
@@ skipping 38 matching lines @@
     UnionAccessor<{{mojom_type}}> input_acc(input.get());
     // TODO(azani): Handle unknown and objects.
     // Set the not-null flag.
     result->size = 16;
     result->tag = input->which();
     switch (input->which()) {
 {%- for field in union.fields %}
       case {{mojom_type}}::Tag::{{field.name|upper}}: {
 {%-   set serializer_type = field.kind|unmapped_type_for_serializer %}
 {%-   if field.kind|is_object_kind %}
+        typename decltype(result->data.f_{{field.name}})::BaseType* ptr;
 {%-     if field.kind|is_union_kind %}
         mojo::internal::Serialize<{{serializer_type}}>(
-            *(input_acc.data()->{{field.name}}), buf,
-            &result->data.f_{{field.name}}.ptr, false, context);
+            *(input_acc.data()->{{field.name}}), buf, &ptr, false, context);
 {%-     elif field.kind|is_array_kind or field.kind|is_map_kind %}
         const ContainerValidateParams {{field.name}}_validate_params(
             {{field.kind|get_container_validate_params_ctor_args|indent(16)}});
         mojo::internal::Serialize<{{serializer_type}}>(
-            *(input_acc.data()->{{field.name}}), buf,
-            &result->data.f_{{field.name}}.ptr, &{{field.name}}_validate_params,
-            context);
+            *(input_acc.data()->{{field.name}}), buf, &ptr,
+            &{{field.name}}_validate_params, context);
 {%-     else %}
         mojo::internal::Serialize<{{serializer_type}}>(
-            *(input_acc.data()->{{field.name}}), buf,
-            &result->data.f_{{field.name}}.ptr, context);
+            *(input_acc.data()->{{field.name}}), buf, &ptr, context);
 {%-     endif %}
+        result->data.f_{{field.name}}.Set(ptr);
 {%-     if not field.kind|is_nullable_kind %}
         MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
-            !result->data.f_{{field.name}}.ptr,
-            mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
+            !ptr, mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
             "null {{field.name}} in {{union.name}} union");
 {%-     endif %}
 
 {%-   elif field.kind|is_any_handle_or_interface_kind %}
         mojo::internal::Serialize<{{serializer_type}}>(
             *input_acc.data()->{{field.name}}, &result->data.f_{{field.name}},
             context);
 {%-     if not field.kind|is_nullable_kind %}
         MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
             !mojo::internal::IsHandleOrInterfaceValid(result->data.f_{{field.name}}),
@@ skipping 33 matching lines @@
   if (input && !input->is_null()) {
     {{mojom_type}}Ptr result({{mojom_type}}::New());
     UnionAccessor<{{mojom_type}}> result_acc(result.get());
     switch (input->tag) {
 {%- for field in union.fields %}
       case {{mojom_type}}::Tag::{{field.name|upper}}: {
 {%-   set serializer_type = field.kind|unmapped_type_for_serializer %}
 {%-   if field.kind|is_object_kind %}
         result_acc.SwitchActive({{mojom_type}}::Tag::{{field.name|upper}});
         if (!mojo::internal::Deserialize<{{serializer_type}}>(
-                input->data.f_{{field.name}}.ptr,
+                input->data.f_{{field.name}}.Get(),
                 result_acc.data()->{{field.name}}, context))
           success = false;
 
 {%-   elif field.kind|is_any_handle_or_interface_kind %}
         typename std::remove_reference<
             decltype(result->get_{{field.name}}())>::type result_{{field.name}};
         bool ret = mojo::internal::Deserialize<{{serializer_type}}>(
             &input->data.f_{{field.name}}, &result_{{field.name}}, context);
         DCHECK(ret);
         result->set_{{field.name}}(std::move(result_{{field.name}}));
@@ skipping 14 matching lines @@
 {%- endfor %}
     }
     *output = std::move(result);
   } else {
     output->reset();
   }
   return success;
 }
 
 }  // namespace internal