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

Side by Side Diff: mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl

Issue 514293002: Mojo: validate nullability in Java bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix line length in mojom_java_generator in a way that works. Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 {% from "constant_definition.tmpl" import constant_def %} 1 {% from "constant_definition.tmpl" import constant_def %}
2 {% from "enum_definition.tmpl" import enum_def %} 2 {% from "enum_definition.tmpl" import enum_def %}
3 3
4 {% macro encode(variable, kind, offset, bit, level=0) %} 4 {% macro encode(variable, kind, offset, bit, level=0) %}
5 {% if kind|is_pointer_array_kind %} 5 {% if kind|is_pointer_array_kind %}
6 {% set sub_kind = kind.kind %} 6 {% set sub_kind = kind.kind %}
7 if ({{variable}} == null) { 7 if ({{variable}} == null) {
8 encoder{{level}}.encodeNullPointer({{offset}}); 8 encoder{{level}}.encodeNullPointer({{offset}});
9 } else { 9 } else {
10 org.chromium.mojo.bindings.Encoder encoder{{level + 1}} = encoder{{level}}.e ncodePointerArray({{variable}}.length, {{offset}}); 10 org.chromium.mojo.bindings.Encoder encoder{{level + 1}} = encoder{{level}}.e ncodePointerArray({{variable}}.length, {{offset}});
11 for (int i{{level}} = 0; i{{level}} < {{variable}}.length; ++i{{level}}) { 11 for (int i{{level}} = 0; i{{level}} < {{variable}}.length; ++i{{level}}) {
12 {{encode(variable~'[i'~level~']', sub_kind, 'DataHeader.HEADER_SIZE + or g.chromium.mojo.bindings.BindingsHelper.POINTER_SIZE * i'~level, 0, level+1)|ind ent(8)}} 12 {{encode(variable~'[i'~level~']', sub_kind, 'DataHeader.HEADER_SIZE + or g.chromium.mojo.bindings.BindingsHelper.POINTER_SIZE * i'~level, 0, level+1)|ind ent(8)}}
13 } 13 }
14 } 14 }
15 {% else %} 15 {% else %}
16 encoder{{level}}.{{kind|encode_method(variable, offset, bit)}}; 16 encoder{{level}}.{{kind|encode_method(variable, offset, bit)}};
17 {% endif %} 17 {% endif %}
18 {% endmacro %} 18 {% endmacro %}
19 19
20 {% macro decode(variable, kind, offset, bit, level=0) %} 20 {% macro decode(variable, kind, offset, bit, level=0) %}
21 {% if kind|is_struct_kind or kind|is_pointer_array_kind %} 21 {% if kind|is_struct_kind or kind|is_pointer_array_kind %}
22 org.chromium.mojo.bindings.Decoder decoder{{level+1}} = decoder{{level}}.readPoi nter({{offset}}); 22 org.chromium.mojo.bindings.Decoder decoder{{level+1}} = decoder{{level}}.readPoi nter({{offset}}, {{kind|is_nullable_kind|java_true_false}});
23 {% if kind|is_struct_kind %} 23 {% if kind|is_struct_kind %}
24 {{variable}} = {{kind|java_type}}.decode(decoder{{level+1}}); 24 {{variable}} = {{kind|java_type}}.decode(decoder{{level+1}});
25 {% else %}{# kind|is_pointer_array_kind #} 25 {% else %}{# kind|is_pointer_array_kind #}
26 if (decoder{{level+1}} == null) { 26 if (decoder{{level+1}} == null) {
27 {{variable}} = null; 27 {{variable}} = null;
28 } else { 28 } else {
29 DataHeader si{{level+1}} = decoder{{level+1}}.readDataHeader(); 29 DataHeader si{{level+1}} = decoder{{level+1}}.readDataHeader();
30 {{variable}} = {{kind|new_array('si'~(level+1)~'.numFields')}}; 30 {{variable}} = {{kind|new_array('si'~(level+1)~'.numFields')}};
31 for (int i{{level+1}} = 0; i{{level+1}} < si{{level+1}}.numFields; ++i{{leve l+1}}) { 31 for (int i{{level+1}} = 0; i{{level+1}} < si{{level+1}}.numFields; ++i{{leve l+1}}) {
32 {{decode(variable~'[i'~(level+1)~']', kind.kind, 'DataHeader.HEADER_SIZE + org.chromium.mojo.bindings.BindingsHelper.POINTER_SIZE * i'~(level+1), 0, lev el+1)|indent(8)}} 32 {{decode(variable~'[i'~(level+1)~']', kind.kind, 'DataHeader.HEADER_SIZE + org.chromium.mojo.bindings.BindingsHelper.POINTER_SIZE * i'~(level+1), 0, lev el+1)|indent(8)}}
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 org.chromium.mojo.bindings.Encoder encoder0 = encoder.getEncoderAtDataOf fset(DEFAULT_STRUCT_INFO); 101 org.chromium.mojo.bindings.Encoder encoder0 = encoder.getEncoderAtDataOf fset(DEFAULT_STRUCT_INFO);
102 {% endif %} 102 {% endif %}
103 {% for byte in struct.bytes %} 103 {% for byte in struct.bytes %}
104 {% for packed_field in byte.packed_fields %} 104 {% for packed_field in byte.packed_fields %}
105 {{encode(packed_field.field|name, packed_field.field.kind, 8+packed_fiel d.offset, packed_field.bit)|indent(8)}} 105 {{encode(packed_field.field|name, packed_field.field.kind, 8+packed_fiel d.offset, packed_field.bit)|indent(8)}}
106 {% endfor %} 106 {% endfor %}
107 {% endfor %} 107 {% endfor %}
108 } 108 }
109 } 109 }
110 {% endmacro %} 110 {% endmacro %}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698