[mojo-bindings] Support reuse of native enum classes

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

 {#  TODO(yzshen): Make these templates more readable. #}
 
 {#  Computes the serialized size for the specified struct.
     |struct| is the struct definition.
     |input_field_pattern| should be a pattern that contains one string
     placeholder, for example, "input->%s", "p_%s". The placeholder will be
     substituted with struct field names to refer to the input fields.
     This macro is expanded to compute seriailized size for both:
     - user-defined structs: the input is an instance of the corresponding struct
       wrapper class.
     - method parameters/response parameters: the input is a list of
       arguments.
     It declares |size| of type size_t to store the resulting size. #}
 {%- macro get_serialized_size(struct, input_field_pattern) -%}
   size_t size = sizeof(internal::{{struct.name}}_Data);
 {%-   for pf in struct.packed.packed_fields_in_ordinal_order if pf.field.kind|is_object_kind %}
 {%-     set name = pf.field.name -%}
 {%-     set kind = pf.field.kind -%}
-{%-     if kind|is_native_only_kind and kind|is_typemapped_kind %}
+{%-     if kind|is_native_struct_kind and kind|is_typemapped_kind %}
   size += mojo::internal::GetSerializedSizeNative_(
       {{input_field_pattern|format(name)}});
 {%-     elif kind|is_typemapped_kind %}
   size +=
       {{kind|get_name_for_kind}}_SerializerTraits_<{{kind|cpp_wrapper_type}}>
           ::GetSize({{input_field_pattern|format(name)}});
 {%-     elif kind|is_union_kind %}
   size += GetSerializedSize_({{input_field_pattern|format(name)}}, true);
 {%-     else %}
   size += GetSerializedSize_({{input_field_pattern|format(name)}});
@@ skipping 17 matching lines @@
       arguments. #}
 {%- macro serialize(struct, struct_display_name, input_field_pattern, output, buffer) -%}
   internal::{{struct.name}}_Data* {{output}} =
       internal::{{struct.name}}_Data::New({{buffer}});
 {%- for pf in struct.packed.packed_fields_in_ordinal_order %}
 {%-   set input_field = input_field_pattern|format(pf.field.name) %}
 {%-   set name = pf.field.name %}
 {%-   set kind = pf.field.kind %}
 {%-   if kind|is_object_kind %}
 {%-     if kind|is_array_kind or
-            (kind|is_native_only_kind and not kind|is_typemapped_kind) %}
+            (kind|is_native_struct_kind and not kind|is_typemapped_kind) %}
   const mojo::internal::ArrayValidateParams {{name}}_validate_params(
       {{kind|get_array_validate_params_ctor_args|indent(10)}});
   mojo::SerializeArray_(std::move({{input_field}}), {{buffer}},
       &{{output}}->{{name}}.ptr, &{{name}}_validate_params);
 {%-     elif kind|is_map_kind %}
   const mojo::internal::ArrayValidateParams {{name}}_validate_params(
       {{kind.value_kind|get_map_validate_params_ctor_args|indent(10)}});
   mojo::SerializeMap_(std::move({{input_field}}), {{buffer}},
       &{{output}}->{{name}}.ptr, &{{name}}_validate_params);
-{%-     elif kind|is_native_only_kind and kind|is_typemapped_kind %}
+{%-     elif kind|is_native_struct_kind and kind|is_typemapped_kind %}
   mojo::internal::SerializeNative_(
       {{input_field}}, {{buffer}}, &{{output}}->{{name}}.ptr);
 {%-     elif kind|is_typemapped_kind %}
   {{kind|get_name_for_kind}}_SerializerTraits_<{{kind|cpp_wrapper_type}}>
       ::Serialize({{input_field}}, {{buffer}}, &{{output}}->{{name}}.ptr);
 {%-     elif kind|is_union_kind %}
   internal::{{kind.name}}_Data* {{name}}_ptr = &{{output}}->{{name}};
   SerializeUnion_(std::move({{input_field}}), {{buffer}}, &{{name}}_ptr, true);
 {%-     else %}
   Serialize_(std::move({{input_field}}), {{buffer}}, &{{output}}->{{name}}.ptr);
@@ skipping 65 matching lines @@
 {%-   set last_checked_version = 0 %}
 {%-   for pf in struct.packed.packed_fields_in_ordinal_order %}
 {%-     set output_field = output_field_pattern|format(pf.field.name) %}
 {%-     set name = pf.field.name %}
 {%-     set kind = pf.field.kind %}
 {%-     if pf.min_version > last_checked_version %}
 {%-       set last_checked_version = pf.min_version %}
     if ({{input}}->header_.version < {{pf.min_version}})
       break;
 {%-     endif %}
-{%-     if kind|is_native_only_kind and kind|is_typemapped_kind %}
+{%-     if kind|is_native_struct_kind and kind|is_typemapped_kind %}
     if (!DeserializeNative_(
             {{input}}->{{name}}.ptr, &{{output_field}}, {{context}})) {
       {{success}} = false;
     }
+{%-     elif kind|is_native_enum_kind and kind|is_typemapped_kind %}
+    {{output_field}} = static_cast<{{kind|cpp_wrapper_type}}>(
+        {{input}}->{{name}}.value);
 {%-     elif kind|is_typemapped_kind %}
     if (!{{kind|get_name_for_kind}}_SerializerTraits_<{{kind|cpp_wrapper_type}}>
             ::Deserialize(
                 {{input}}->{{name}}.ptr, &{{output_field}}, {{context}})) {
       {{success}} = false;
     }
 {%-     elif kind|is_object_kind %}
 {%-       if kind|is_union_kind %}
     if (!Deserialize_(&{{input}}->{{name}}, &{{output_field}}, {{context}}))
       {{success}} = false;
@@ skipping 14 matching lines @@
         &{{output_field}},
         ({{context}})->router->CreateLocalEndpointHandle(mojo::internal::FetchAndReset(&{{input}}->{{name}})));
 {%-     elif kind|is_enum_kind %}
     {{output_field}} = static_cast<{{kind|cpp_wrapper_type}}>({{input}}->{{name}}.value);
 {%-     else %}
     {{output_field}} = {{input}}->{{name}};
 {%-     endif %}
 {%-   endfor %}
   } while (false);
 {%- endmacro %}