Mojom runtime type info: New implementation for Go.

mojo/public/tools/bindings/generators/go_templates/interface.tmpl

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 {% import "struct.tmpl" as struct_macros %}
-{% import "mojom_type_macros.tmpl" as mojom_type_macros %}
 
 {%- macro declare_params(struct) %}
 {%- for field in struct.fields -%}
         {{field|name(False)}} {{field.kind|go_type}}{% if not loop.last %}, {% endif %}
 {%- endfor %}
 {%- endmacro %}
 
 
 
 {% macro declare_request_params(method) %}
@@ skipping 53 matching lines @@
 type {{interface|name}}_Factory interface {
         Create(request {{interface|name}}_Request)
 }
 
 {% if interface.service_name %}
 func (f *{{interface|name}}_ServiceFactory) Name() string {
         return {{interface|name(False)}}_Name
 }
 {% endif %}
 
+// TODO(rudominer) This should only be defined for top-level interfaces.
 func (f *{{interface|name}}_ServiceFactory) ServiceDescription() {{descpkg}}ServiceDescription {
         return &{{interface|name}}_ServiceDescription{}
 }
 
 func (f *{{interface|name}}_ServiceFactory) Create(messagePipe system.MessagePipeHandle) {
         request := {{interface|name}}_Request{bindings.NewMessagePipeHandleOwner(messagePipe)}
         f.Delegate.Create(request)
 }
 
 // CreateMessagePipeFor{{interface|name}} creates a message pipe for use with the
@@ skipping 86 matching lines @@
 type {{interface|name(False)}}_Stub struct {
         connector *bindings.Connector
         impl {{interface|name}}
 }
 
 func New{{interface|name}}Stub(r {{interface|name}}_Request, impl {{interface|name}}, waiter bindings.AsyncWaiter) *bindings.Stub {
         connector := bindings.NewConnector(r.PassMessagePipe(), waiter)
         return bindings.NewStub(connector, &{{interface|name(False)}}_Stub{connector, impl})
 }
 
-{{ mojom_type_macros.writeMojomTypeDef(typepkg, interface, pkg, exported) }}
 
 func (f *{{interface|name}}_Request) ServiceDescription() {{descpkg}}ServiceDescription {
         return &{{interface|name}}_ServiceDescription{}
 }
 
 
 type {{interface|name}}_ServiceDescription struct{}
 
-{% if should_gen_mojom_types -%}
+{% if should_gen_mojom_types and interface.service_name-%}
 func (sd *{{interface|name}}_ServiceDescription) GetTopLevelInterface() (outMojomInterface {{typepkg}}MojomInterface, err error) {
-        return {{interface|mojom_type_identifier}}(), nil
+        interfaceTypeKey := runtimeTypeInfo__.ServicesByName["{{interface.service_name}}"].TopLevelInterface
+        userDefinedType := runtimeTypeInfo__.TypeMap[interfaceTypeKey].(*{{typepkg}}UserDefinedTypeInterfaceType)
+        return userDefinedType.Value, nil
 }
 
 func (sd *{{interface|name}}_ServiceDescription) GetTypeDefinition(inTypeKey string) (outType mojom_types.UserDefinedType, err error) {
         if udt, ok := GetAllMojomTypeDefinitions()[inTypeKey]; ok {
                 return udt, nil
         }
         return nil, fmt.Errorf("%s_ServiceDescription does not recognize %s", "{{interface|name}}", inTypeKey)
 }
 
 func (sd *{{interface|name}}_ServiceDescription) GetAllTypeDefinitions() (outDefinitions *map[string]mojom_types.UserDefinedType, err error) {
@@ skipping 70 matching lines @@
         default:
                 return &bindings.ValidationError{
                         bindings.MessageHeaderUnknownMethod,
                         fmt.Sprintf("unknown method %v", message.Header.Type),
                 }
         }
         return
 }
 
 {% endmacro %}