Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / public / tools / bindings / generators / cpp_templates / interface_definition.tmpl

diff --git a/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
index 9b6a324..17f75b6 100644 (file)
--- a/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
+++ b/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
@@ -22,7 +22,7 @@ p{{loop.index}}.Pass()
 mojo::MakeProxy<{{param.kind|get_name_for_kind}}>(mojo::MakeScopedHandle(mojo::internal::FetchAndReset(&params->{{param.name}})))
 {%-     elif param.kind|is_interface_request_kind -%}
 mojo::MakeRequest<{{param.kind.kind|get_name_for_kind}}>(mojo::MakeScopedHandle(mojo::internal::FetchAndReset(&params->{{param.name}})))
-{%-     elif param.kind|is_handle_kind -%}
+{%-     elif param.kind|is_any_handle_kind -%}
 mojo::MakeScopedHandle(mojo::internal::FetchAndReset(&params->{{param.name}}))
 {%-     elif param.kind|is_enum_kind -%}
 static_cast<{{param.kind|cpp_wrapper_type}}>(params->{{param.name}})
@@ -61,7 +61,7 @@ params->{{param.name}}
 {%-     elif param.kind|is_interface_request_kind %}
   // Delegate handle.
   params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release();
-{%-     elif param.kind|is_handle_kind %}
+{%-     elif param.kind|is_any_handle_kind %}
   params->{{param.name}} = in_{{param.name}}.release();
 {%-     else %}
   params->{{param.name}} = in_{{param.name}};
@@ -76,7 +76,7 @@ params->{{param.name}}
 const char* {{class_name}}::Name_ = "{{namespace_as_string}}::{{class_name}}";
 {#--- Constants #}
 {%  for constant in interface.constants %}
-const {{constant.kind|cpp_pod_type}} {{interface.name}}::{{constant.name}} = {{constant.value|expression_to_text}};
+const {{constant.kind|cpp_pod_type}} {{interface.name}}::{{constant.name}} = {{constant|constant_value}};
 {%- endfor %}
 
 {#--- ForwardToCallback definition #}