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/cpp_templates/interface_definition.tmpl

Issue 488123003: Mojo cpp bindings: remove IsNonNullableValidationEnabled() check (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 {%- import "interface_macros.tmpl" as interface_macros %} 1 {%- import "interface_macros.tmpl" as interface_macros %}
2 {%- set class_name = interface.name %} 2 {%- set class_name = interface.name %}
3 {%- set proxy_name = interface.name ~ "Proxy" %} 3 {%- set proxy_name = interface.name ~ "Proxy" %}
4 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %} 4 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}
5 5
6 {%- macro alloc_params(parameters) %} 6 {%- macro alloc_params(parameters) %}
7 {%- for param in parameters %} 7 {%- for param in parameters %}
8 {%- if param.kind|is_object_kind %} 8 {%- if param.kind|is_object_kind %}
9 {{param.kind|cpp_result_type}} p{{loop.index}}; 9 {{param.kind|cpp_result_type}} p{{loop.index}};
10 Deserialize_(params->{{param.name}}.ptr, &p{{loop.index}}); 10 Deserialize_(params->{{param.name}}.ptr, &p{{loop.index}});
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 {% for param in parameters %} 53 {% for param in parameters %}
54 {%- if param.kind|is_object_kind %} 54 {%- if param.kind|is_object_kind %}
55 {%- if param.kind|is_any_array_kind %} 55 {%- if param.kind|is_any_array_kind %}
56 mojo::SerializeArray_<{{param.kind|get_array_validate_params|indent(24)}}>( 56 mojo::SerializeArray_<{{param.kind|get_array_validate_params|indent(24)}}>(
57 mojo::internal::Forward(in_{{param.name}}), builder.buffer(), &params->{{p aram.name}}.ptr); 57 mojo::internal::Forward(in_{{param.name}}), builder.buffer(), &params->{{p aram.name}}.ptr);
58 {%- else %} 58 {%- else %}
59 Serialize_(mojo::internal::Forward(in_{{param.name}}), builder.buffer(), &para ms->{{param.name}}.ptr); 59 Serialize_(mojo::internal::Forward(in_{{param.name}}), builder.buffer(), &para ms->{{param.name}}.ptr);
60 {%- endif %} 60 {%- endif %}
61 {%- if not param.kind|is_nullable_kind %} 61 {%- if not param.kind|is_nullable_kind %}
62 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING( 62 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
63 mojo::internal::IsNonNullableValidationEnabled() && 63 !params->{{param.name}}.ptr,
64 !params->{{param.name}}.ptr,
65 mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER); 64 mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER);
66 {%- endif %} 65 {%- endif %}
67 {%- elif param.kind|is_any_handle_kind %} 66 {%- elif param.kind|is_any_handle_kind %}
68 {%- if param.kind|is_interface_kind or 67 {%- if param.kind|is_interface_kind or
69 param.kind|is_interface_request_kind %} 68 param.kind|is_interface_request_kind %}
70 // Delegate handle. 69 // Delegate handle.
71 params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release(); 70 params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release();
72 {%- else %} 71 {%- else %}
73 params->{{param.name}} = in_{{param.name}}.release(); 72 params->{{param.name}} = in_{{param.name}}.release();
74 {%- endif %} 73 {%- endif %}
75 {%- if not param.kind|is_nullable_kind %} 74 {%- if not param.kind|is_nullable_kind %}
76 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING( 75 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
77 mojo::internal::IsNonNullableValidationEnabled() && 76 !params->{{param.name}}.is_valid(),
78 !params->{{param.name}}.is_valid(),
79 mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE); 77 mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE);
80 {%- endif %} 78 {%- endif %}
81 {%- else %} 79 {%- else %}
82 params->{{param.name}} = in_{{param.name}}; 80 params->{{param.name}} = in_{{param.name}};
83 {%- endif %} 81 {%- endif %}
84 {%- endfor %} 82 {%- endfor %}
85 mojo::Message message; 83 mojo::Message message;
86 params->EncodePointersAndHandles(message.mutable_handles()); 84 params->EncodePointersAndHandles(message.mutable_handles());
87 builder.Finish(&message); 85 builder.Finish(&message);
88 {%- endmacro %} 86 {%- endmacro %}
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 } 319 }
322 break; 320 break;
323 } 321 }
324 {%- endfor %} 322 {%- endfor %}
325 } 323 }
326 {%- endif %} 324 {%- endif %}
327 325
328 return sink_->Accept(message); 326 return sink_->Accept(message);
329 } 327 }
330 {%- endif -%} 328 {%- endif -%}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698