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

Side by Side Diff: mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl

Issue 469393004: Mojo: Add warning of invalid serialization results (in debug build). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 size_t GetSerializedSize_(const {{struct.name}}Ptr& input) { 1 size_t GetSerializedSize_(const {{struct.name}}Ptr& input) {
2 if (!input) 2 if (!input)
3 return 0; 3 return 0;
4 size_t size = sizeof(internal::{{struct.name}}_Data); 4 size_t size = sizeof(internal::{{struct.name}}_Data);
5 {%- for pf in struct.packed.packed_fields if pf.field.kind|is_object_kind %} 5 {%- for pf in struct.packed.packed_fields if pf.field.kind|is_object_kind %}
6 size += GetSerializedSize_(input->{{pf.field.name}}); 6 size += GetSerializedSize_(input->{{pf.field.name}});
7 {%- endfor %} 7 {%- endfor %}
8 return size; 8 return size;
9 } 9 }
10 10
11 void Serialize_({{struct.name}}Ptr input, mojo::internal::Buffer* buf, 11 void Serialize_({{struct.name}}Ptr input, mojo::internal::Buffer* buf,
12 internal::{{struct.name}}_Data** output) { 12 internal::{{struct.name}}_Data** output) {
13 if (input) { 13 if (input) {
14 internal::{{struct.name}}_Data* result = 14 internal::{{struct.name}}_Data* result =
15 internal::{{struct.name}}_Data::New(buf); 15 internal::{{struct.name}}_Data::New(buf);
16 {%- for pf in struct.packed.packed_fields %} 16 {%- for pf in struct.packed.packed_fields %}
17 {%- if pf.field.kind|is_object_kind %} 17 {%- if pf.field.kind|is_object_kind %}
18 {%- if pf.field.kind|is_any_array_kind %}
19 mojo::SerializeArray_<{{pf.field.kind|get_array_validate_params|indent(26)}} >(
20 mojo::internal::Forward(input->{{pf.field.name}}), buf, &result->{{pf.fi eld.name}}.ptr);
21 {%- else %}
18 Serialize_(mojo::internal::Forward(input->{{pf.field.name}}), buf, &result-> {{pf.field.name}}.ptr); 22 Serialize_(mojo::internal::Forward(input->{{pf.field.name}}), buf, &result-> {{pf.field.name}}.ptr);
19 {%- elif pf.field.kind|is_interface_kind %} 23 {%- endif %}
24 {%- if not pf.field.kind|is_nullable_kind %}
25 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
26 mojo::internal::IsNonNullableValidationEnabled() &&
27 !result->{{pf.field.name}}.ptr,
28 mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER);
29 {%- endif %}
30 {%- elif pf.field.kind|is_any_handle_kind %}
31 {%- if pf.field.kind|is_interface_kind %}
20 result->{{pf.field.name}} = input->{{pf.field.name}}.PassMessagePipe().relea se(); 32 result->{{pf.field.name}} = input->{{pf.field.name}}.PassMessagePipe().relea se();
21 {%- elif pf.field.kind|is_any_handle_kind %} 33 {%- else %}
22 result->{{pf.field.name}} = input->{{pf.field.name}}.release(); 34 result->{{pf.field.name}} = input->{{pf.field.name}}.release();
35 {%- endif %}
36 {%- if not pf.field.kind|is_nullable_kind %}
37 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
38 mojo::internal::IsNonNullableValidationEnabled() &&
39 !result->{{pf.field.name}}.is_valid(),
40 mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE);
41 {%- endif %}
23 {%- else %} 42 {%- else %}
24 result->{{pf.field.name}} = input->{{pf.field.name}}; 43 result->{{pf.field.name}} = input->{{pf.field.name}};
25 {%- endif %} 44 {%- endif %}
26 {%- endfor %} 45 {%- endfor %}
27 *output = result; 46 *output = result;
28 } else { 47 } else {
29 *output = NULL; 48 *output = NULL;
30 } 49 }
31 } 50 }
32 51
(...skipping 14 matching lines...) Expand all
47 input->{{pf.field.name}}); 66 input->{{pf.field.name}});
48 {%- else %} 67 {%- else %}
49 result->{{pf.field.name}} = input->{{pf.field.name}}; 68 result->{{pf.field.name}} = input->{{pf.field.name}};
50 {%- endif %} 69 {%- endif %}
51 {%- endfor %} 70 {%- endfor %}
52 *output = result.Pass(); 71 *output = result.Pass();
53 } else { 72 } else {
54 output->reset(); 73 output->reset();
55 } 74 }
56 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698