Mojo: Prefix user-defined parameter names to avoid conflicts

BUG=342543

Review URL: https://codereview.chromium.org/163113002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251179 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/mojo/public/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/bindings/generators/cpp_templates/interface_definition.tmpl
index 713939a..fc6c17a 100644
--- a/mojo/public/bindings/generators/cpp_templates/interface_definition.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/interface_definition.tmpl
@@ -8,7 +8,7 @@
 {#--- Proxy definitions #}
 {%- macro params_list(method) %}
 {%-   for param in method.parameters -%}
-{{param.kind|cpp_const_wrapper_type}} {{param.name}}
+{{param.kind|cpp_const_wrapper_type}} in_{{param.name}}
 {%- if not loop.last %}, {% endif %}
 {%-   endfor %}
 {%- endmacro %}
@@ -23,8 +23,8 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) {
 {#--- Computes #}
 {%-   for param in method.parameters %}
 {%-     if param.kind|is_object_kind %}
-  if (!{{param.name}}.is_null())
-    payload_size += mojo::internal::Unwrap({{param.name}})->ComputeSize();
+  if (!in_{{param.name}}.is_null())
+    payload_size += mojo::internal::Unwrap(in_{{param.name}})->ComputeSize();
 {%-     endif %}
 {%-   endfor %}
 
@@ -36,13 +36,13 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) {
 {#--- Sets #}
 {%   for param in method.parameters %}
 {%-     if param.kind|is_object_kind %}
-  if (!{{param.name}}.is_null())
+  if (!in_{{param.name}}.is_null())
     params->set_{{param.name}}(
-        mojo::internal::Unwrap({{param.name}})->Clone(builder.buffer()));
+        mojo::internal::Unwrap(in_{{param.name}})->Clone(builder.buffer()));
 {%-     elif param.kind|is_handle_kind %}
-  params->set_{{param.name}}({{param.name}}.release());
+  params->set_{{param.name}}(in_{{param.name}}.release());
 {%-     else %}
-  params->set_{{param.name}}({{param.name}});
+  params->set_{{param.name}}(in_{{param.name}});
 {%-     endif %}
 {%-   endfor %}