Mojom generator: move Is.*Kind() functions into module.py and use them from all mojom_.*_generator.…

mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

 {%- import "interface_macros.tmpl" as interface_macros %}
 {%- set class_name = interface.name %}
 {%- set proxy_name = interface.name ~ "Proxy" %}
 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}
 
 {%- macro alloc_params(parameters) %}
 {%-   for param in parameters %}
 {%-     if param.kind|is_object_kind  %}
 {{param.kind|cpp_result_type}} p{{loop.index}};
 Deserialize_(params->{{param.name}}.ptr, &p{{loop.index}});
 {%      endif -%}
 {%-   endfor %}
 {%- endmacro %}
 
 {%- macro pass_params(parameters) %}
 {%-   for param in parameters %}
 {%-     if param.kind|is_string_kind -%}
 p{{loop.index}}
 {%-     elif param.kind|is_object_kind -%}
 p{{loop.index}}.Pass()
 {%-     elif param.kind|is_interface_kind -%}
 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}})
 {%-     else -%}
 params->{{param.name}}
 {%-     endif -%}
 {%-     if not loop.last %}, {% endif %}
 {%-   endfor %}
 {%- endmacro %}
 
@@ skipping 18 matching lines @@
 {%-     elif param.kind|is_interface_kind %}
   if (!in_{{param.name}}.get()) {
     params->{{param.name}} = mojo::MessagePipeHandle();
   } else {
     // Delegate handle.
     params->{{param.name}} = in_{{param.name}}.PassMessagePipe().release();
   }
 {%-     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}};
 {%-     endif %}
 {%-   endfor %}
   mojo::Message message;
   params->EncodePointersAndHandles(message.mutable_handles());
   builder.Finish(&message);
 {%- endmacro %}
 
@@ skipping 231 matching lines @@
       }
       break;
     }
 {%-   endfor %}
   }
 {%- endif %}
 
   return sink_->Accept(message);
 }
 {%- endif -%}