Implement unions as members of structs.

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

Index: mojo/public/tools/bindings/generators/cpp_templates/serialization_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/serialization_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/serialization_macros.tmpl
index 2be038cbc3f6ed77c95d23ecd0e6e16a79b9d2d2..fdcc6d7db363141b16630461ad98309bdeec9be7 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/serialization_macros.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/serialization_macros.tmpl
@@ -1,7 +1,17 @@
-{%- macro declare_serialization(name) %}
+{%- macro declare_struct_serialization(name) %}

[yzshen1, 2015/03/26 07:30:14]

now that union and struct don't share the same declaration, maybe we don't have
to make them macros. Besides, we could put them in
{struct,union}_serialization_declaration.tmpl

[azani, 2015/03/26 22:27:39]

Done.

 size_t GetSerializedSize_(const {{name}}Ptr& input);
 void Serialize_({{name}}Ptr input, mojo::internal::Buffer* buffer,
                 internal::{{name}}_Data** output);
 void Deserialize_(internal::{{name}}_Data* input,
                   {{name}}Ptr* output);
 {%- endmacro %}
+
+{%- macro declare_union_serialization(name) %}
+size_t GetSerializedSize_(const {{name}}Ptr& input);

[yzshen1, 2015/03/26 07:30:14]

What is the relationship between this one and the following tow functions? Maybe
you could add some comments.

[azani, 2015/03/26 22:27:39]

Next two are gone. I ended up not needing them in this CL.

+size_t GetUnionInUnionSerializedSize_(const {{name}}Ptr& input);
+size_t GetStandaloneSerializeSize_(const {{name}}Ptr& input);

[yzshen1, 2015/03/26 07:30:14]

This one is not defined in union_serialization_definition.

[azani, 2015/03/26 22:27:39]

Done.

+void SerializeUnion_({{name}}Ptr input, mojo::internal::Buffer* buffer,
+                     internal::{{name}}_Data** output, bool inlined);
+void Deserialize_(internal::{{name}}_Data* input,
+                  {{name}}Ptr* output);
+{%- endmacro %}