Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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(), ¶ms->{{p aram.name}}.ptr); | 57 mojo::internal::Forward(in_{{param.name}}), builder.buffer(), ¶ms->{{p aram.name}}.ptr); |
| 58 {%- else %} | 58 {%- else %} |
| 59 Serialize_(mojo::internal::Forward(in_{{param.name}}), builder.buffer(), ¶ ms->{{param.name}}.ptr); | 59 Serialize_(mojo::internal::Forward(in_{{param.name}}), builder.buffer(), ¶ 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 mojo::internal::IsNonNullableValidationEnabled() && |
| 64 !params->{{param.name}}.ptr, | 64 !params->{{param.name}}.ptr, |
| 65 mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER); | 65 mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER, |
| 66 "null {{param.name}} argument"); | |
|
hansmuller
2014/08/21 00:26:40
It might be useful to include the name of the inte
yzshen1
2014/08/21 05:57:49
Done.
| |
| 66 {%- endif %} | 67 {%- endif %} |
| 67 {%- elif param.kind|is_any_handle_kind %} | 68 {%- elif param.kind|is_any_handle_kind %} |
| 68 {%- if param.kind|is_interface_kind or | 69 {%- if param.kind|is_interface_kind or |
| 69 param.kind|is_interface_request_kind %} | 70 param.kind|is_interface_request_kind %} |
| 70 // Delegate handle. | 71 // Delegate handle. |
| 71 params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release(); | 72 params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release(); |
| 72 {%- else %} | 73 {%- else %} |
| 73 params->{{param.name}} = in_{{param.name}}.release(); | 74 params->{{param.name}} = in_{{param.name}}.release(); |
| 74 {%- endif %} | 75 {%- endif %} |
| 75 {%- if not param.kind|is_nullable_kind %} | 76 {%- if not param.kind|is_nullable_kind %} |
| 76 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING( | 77 MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING( |
| 77 mojo::internal::IsNonNullableValidationEnabled() && | 78 mojo::internal::IsNonNullableValidationEnabled() && |
| 78 !params->{{param.name}}.is_valid(), | 79 !params->{{param.name}}.is_valid(), |
| 79 mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE); | 80 mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE, |
| 81 "invalid {{param.name}} argument"); | |
| 80 {%- endif %} | 82 {%- endif %} |
| 81 {%- else %} | 83 {%- else %} |
| 82 params->{{param.name}} = in_{{param.name}}; | 84 params->{{param.name}} = in_{{param.name}}; |
| 83 {%- endif %} | 85 {%- endif %} |
| 84 {%- endfor %} | 86 {%- endfor %} |
| 85 mojo::Message message; | 87 mojo::Message message; |
| 86 params->EncodePointersAndHandles(message.mutable_handles()); | 88 params->EncodePointersAndHandles(message.mutable_handles()); |
| 87 builder.Finish(&message); | 89 builder.Finish(&message); |
| 88 {%- endmacro %} | 90 {%- endmacro %} |
| 89 | 91 |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 } | 323 } |
| 322 break; | 324 break; |
| 323 } | 325 } |
| 324 {%- endfor %} | 326 {%- endfor %} |
| 325 } | 327 } |
| 326 {%- endif %} | 328 {%- endif %} |
| 327 | 329 |
| 328 return sink_->Accept(message); | 330 return sink_->Accept(message); |
| 329 } | 331 } |
| 330 {%- endif -%} | 332 {%- endif -%} |
| OLD | NEW |