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

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

Issue 522653004: mojo: Validate fixed size array for the mojo java bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gn build. 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 array_expected_length(kind) -%}
5 {%- if kind|is_fixed_array_kind -%}
6 {{kind.length}}
7 {%- else -%}
8 org.chromium.mojo.bindings.BindingsHelper.UNSPECIFIED_ARRAY_LENGTH
9 {%- endif -%}
10 {%- endmacro -%}
11
4 {% macro encode(variable, kind, offset, bit, level=0) %} 12 {% macro encode(variable, kind, offset, bit, level=0) %}
5 {% if kind|is_pointer_array_kind %} 13 {% if kind|is_pointer_array_kind %}
6 {% set sub_kind = kind.kind %} 14 {% set sub_kind = kind.kind %}
7 if ({{variable}} == null) { 15 if ({{variable}} == null) {
8 encoder{{level}}.encodeNullPointer({{offset}}); 16 encoder{{level}}.encodeNullPointer({{offset}});
9 } else { 17 } else {
10 org.chromium.mojo.bindings.Encoder encoder{{level + 1}} = encoder{{level}}.e ncodePointerArray({{variable}}.length, {{offset}}); 18 org.chromium.mojo.bindings.Encoder encoder{{level + 1}} = encoder{{level}}.e ncodePointerArray({{variable}}.length, {{offset}}, {{array_expected_length(kind) }});
11 for (int i{{level}} = 0; i{{level}} < {{variable}}.length; ++i{{level}}) { 19 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)}} 20 {{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 } 21 }
14 } 22 }
15 {% else %} 23 {% else %}
16 encoder{{level}}.{{kind|encode_method(variable, offset, bit)}}; 24 encoder{{level}}.{{kind|encode_method(variable, offset, bit)}};
17 {% endif %} 25 {% endif %}
18 {% endmacro %} 26 {% endmacro %}
19 27
20 {% macro decode(variable, kind, offset, bit, level=0) %} 28 {% macro decode(variable, kind, offset, bit, level=0) %}
21 {% if kind|is_struct_kind or kind|is_pointer_array_kind %} 29 {% 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}}, {{kind|is_nullable_kind|java_true_false}}); 30 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 %} 31 {% if kind|is_struct_kind %}
24 {{variable}} = {{kind|java_type}}.decode(decoder{{level+1}}); 32 {{variable}} = {{kind|java_type}}.decode(decoder{{level+1}});
25 {% else %}{# kind|is_pointer_array_kind #} 33 {% else %}{# kind|is_pointer_array_kind #}
26 if (decoder{{level+1}} == null) { 34 if (decoder{{level+1}} == null) {
27 {{variable}} = null; 35 {{variable}} = null;
28 } else { 36 } else {
29 DataHeader si{{level+1}} = decoder{{level+1}}.readDataHeader(); 37 DataHeader si{{level+1}} = decoder{{level+1}}.readArrayDataHeader({{array_ex pected_length(kind)}});
30 {{variable}} = {{kind|new_array('si'~(level+1)~'.numFields')}}; 38 {{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}}) { 39 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)}} 40 {{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)}}
33 } 41 }
34 } 42 }
35 {% endif %} 43 {% endif %}
36 {% else %} 44 {% else %}
37 {{variable}} = decoder{{level}}.{{kind|decode_method(offset, bit)}}; 45 {{variable}} = decoder{{level}}.{{kind|decode_method(offset, bit)}};
38 {% endif %} 46 {% endif %}
39 {% endmacro %} 47 {% endmacro %}
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 org.chromium.mojo.bindings.Encoder encoder0 = encoder.getEncoderAtDataOf fset(DEFAULT_STRUCT_INFO); 109 org.chromium.mojo.bindings.Encoder encoder0 = encoder.getEncoderAtDataOf fset(DEFAULT_STRUCT_INFO);
102 {% endif %} 110 {% endif %}
103 {% for byte in struct.bytes %} 111 {% for byte in struct.bytes %}
104 {% for packed_field in byte.packed_fields %} 112 {% 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)}} 113 {{encode(packed_field.field|name, packed_field.field.kind, 8+packed_fiel d.offset, packed_field.bit)|indent(8)}}
106 {% endfor %} 114 {% endfor %}
107 {% endfor %} 115 {% endfor %}
108 } 116 }
109 } 117 }
110 {% endmacro %} 118 {% endmacro %}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698