mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl - Issue 1520153002: [mojo] Allow value deserialization to fail

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

Issue 1520153002: [mojo] Allow value deserialization to fail (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bindings-3-misc-support

Patch Set: merge Created 5 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/public/cpp/bindings/lib/string_serialization.cc ('k') | mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

index 9889f8b8bcd0cd274306538a0d8fa5a3365c27e5..a4453131d4d701044ebef897da016f69da852661 100644

--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

+++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

@@ -7,10 +7,13 @@

{%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}

{%- macro alloc_params(struct, serialization_context) %}

+ bool success = true;

{%- for param in struct.packed.packed_fields_in_ordinal_order %}

{{param.field.kind|cpp_result_type}} p_{{param.field.name}}{};

{%- endfor %}

- {{struct_macros.deserialize(struct, "params", "p_%s", serialization_context)}}

+ {{struct_macros.deserialize(struct, "params", "p_%s", serialization_context, "success")}}

+ if (!success)

+ return false;

{%- endmacro %}

{%- macro pass_params(parameters) %}

@@ -224,11 +227,11 @@ bool {{class_name}}Stub::AcceptWithResponder(

message->mutable_payload());

params->DecodePointersAndHandles(message->mutable_handles());

+ {{alloc_params(method.param_struct, "&serialization_context_")|indent(4)}}

{{class_name}}::{{method.name}}Callback::Runnable* runnable =

new {{class_name}}_{{method.name}}_ProxyToResponder(

message->request_id(), responder);

{{class_name}}::{{method.name}}Callback callback(runnable);

- {{alloc_params(method.param_struct, "&serialization_context_")|indent(4)}}

// A null |sink_| means no implementation was bound.

assert(sink_);

TRACE_EVENT0("mojom", "{{class_name}}::{{method.name}}");