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

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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: third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
index 76c07fde69ecb95e16b70acc0c0498aa4600ecb2..a796b29ad59121f520acadd7c375f2c87699a32c 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
@@ -67,9 +67,12 @@ encoder{{level}}.{{kind|encode_method(variable, offset, bit)}};
{% endmacro %}
{% macro decode(variable, kind, offset, bit, level=0) %}
-{% if kind|is_struct_kind or kind|is_pointer_array_kind or kind|is_map_kind %}
+{% if kind|is_struct_kind or
+ kind|is_pointer_array_kind or
+ kind|is_map_kind or
+ kind|is_union_kind %}
org.chromium.mojo.bindings.Decoder decoder{{level+1}} = decoder{{level}}.readPointer({{offset}}, {{kind|is_nullable_kind|java_true_false}});
-{% if kind|is_struct_kind %}
+{% if kind|is_struct_kind or kind|is_union_kind %}
{{variable}} = {{kind|java_type}}.decode(decoder{{level+1}});
{% else %}{# kind|is_pointer_array_kind or is_map_kind #}
{% if kind|is_nullable_kind %}

Powered by Google App Engine
This is Rietveld 408576698