Commit 248f1ce5 authored by darin@chromium.org's avatar darin@chromium.org

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
parent 8f9b592b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{#--- Proxy definitions #} {#--- Proxy definitions #}
{%- macro params_list(method) %} {%- macro params_list(method) %}
{%- for param in method.parameters -%} {%- 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 %} {%- if not loop.last %}, {% endif %}
{%- endfor %} {%- endfor %}
{%- endmacro %} {%- endmacro %}
...@@ -23,8 +23,8 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) { ...@@ -23,8 +23,8 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) {
{#--- Computes #} {#--- Computes #}
{%- for param in method.parameters %} {%- for param in method.parameters %}
{%- if param.kind|is_object_kind %} {%- if param.kind|is_object_kind %}
if (!{{param.name}}.is_null()) if (!in_{{param.name}}.is_null())
payload_size += mojo::internal::Unwrap({{param.name}})->ComputeSize(); payload_size += mojo::internal::Unwrap(in_{{param.name}})->ComputeSize();
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
...@@ -36,13 +36,13 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) { ...@@ -36,13 +36,13 @@ void {{proxy_name}}::{{method.name}}({{params_list(method)}}) {
{#--- Sets #} {#--- Sets #}
{% for param in method.parameters %} {% for param in method.parameters %}
{%- if param.kind|is_object_kind %} {%- if param.kind|is_object_kind %}
if (!{{param.name}}.is_null()) if (!in_{{param.name}}.is_null())
params->set_{{param.name}}( 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 %} {%- elif param.kind|is_handle_kind %}
params->set_{{param.name}}({{param.name}}.release()); params->set_{{param.name}}(in_{{param.name}}.release());
{%- else %} {%- else %}
params->set_{{param.name}}({{param.name}}); params->set_{{param.name}}(in_{{param.name}});
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment