mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl - Issue 2112093002: Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively.

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/validation_macros.tmpl

Issue 2112093002: Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@61_array_fix

Patch Set: . Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl ('k') | mojo/public/tools/bindings/generators/mojom_cpp_generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 76a3637e33ba143a160e9df7c7ec110cf00b5da9..367be6d67b56957b5d05af9122f2214f2883e6ef 100644

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

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

@@ -20,18 +20,11 @@

}

{%- endif %}

-{%- if kind|is_array_kind or kind|is_string_kind %}

+{%- if kind|is_array_kind or kind|is_string_kind or kind|is_map_kind %}

const mojo::internal::ContainerValidateParams {{name}}_validate_params(

{{kind|get_container_validate_params_ctor_args|indent(6)}});

- if (!mojo::internal::ValidateArray({{field_expr}}, validation_context,

- &{{name}}_validate_params)) {

- return false;

- }

-{%- elif kind|is_map_kind %}

- const mojo::internal::ContainerValidateParams {{name}}_validate_params(

- {{kind|get_container_validate_params_ctor_args|indent(6)}});

- if (!mojo::internal::ValidateMap({{field_expr}}, validation_context,

- &{{name}}_validate_params)) {

+ if (!mojo::internal::ValidateContainer({{field_expr}}, validation_context,

+ &{{name}}_validate_params)) {

return false;

}

{%- elif kind|is_struct_kind %}