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

Unified Diff: mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl

Issue 2556353004: Mojo JS bindings: code generator maps interface ptr and request to InterfacePtr and InterfaceReques… (Closed)
Patch Set: . Created 4 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
Index: mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl b/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl
index 3d0be6e95e334b97e3834b8d6e57baae9f5a9aa2..d4e15a7859607061dcaf9f7aa17eaaf596d02178 100644
--- a/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl
+++ b/mojo/public/tools/bindings/generators/js_templates/validation_macros.tmpl
@@ -6,7 +6,7 @@ if (err !== validator.validationError.NONE)
{%- macro _validate_field(field, offset, name) %}
{%- if field|is_string_pointer_field %}
// validate {{name}}
-err = messageValidator.validateStringPointer({{offset}}, {{field|validate_string_params}})
+err = messageValidator.validateStringPointer({{offset}}, {{field|validate_nullable_params}})
{{_check_err()}}
{%- elif field|is_array_pointer_field %}
// validate {{name}}
@@ -22,11 +22,15 @@ err = messageValidator.validateMapPointer({{offset}}, {{field|validate_map_param
{{_check_err()}}
{%- elif field|is_interface_field %}
// validate {{name}}
-err = messageValidator.validateInterface({{offset}}, {{field|validate_interface_params}});
+err = messageValidator.validateInterface({{offset}}, {{field|validate_nullable_params}});
{{_check_err()}}
-{%- elif field|is_handle_field or field|is_interface_request_field %}
+{%- elif field|is_interface_request_field %}
// validate {{name}}
-err = messageValidator.validateHandle({{offset}}, {{field|validate_handle_params}})
+err = messageValidator.validateInterfaceRequest({{offset}}, {{field|validate_nullable_params}})
+{{_check_err()}}
+{%- elif field|is_handle_field %}
+// validate {{name}}
+err = messageValidator.validateHandle({{offset}}, {{field|validate_nullable_params}})
{{_check_err()}}
{%- elif field|is_enum_field %}
// validate {{name}}

Powered by Google App Engine
This is Rietveld 408576698