Add associated interfaces & bindings.

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

 {%- for method in interface.methods %}
   var k{{interface.name}}_{{method.name}}_Name = {{method.ordinal}};
 {%- endfor %}
 
   function {{interface.name}}Ptr(handleOrPtrInfo) {
     this.ptr = new bindings.InterfacePtrController({{interface.name}},
                                                    handleOrPtrInfo);
   }
 
+  function Associated{{interface.name}}Ptr(associatedInterfacePtrInfo) {
+    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
+        {{interface.name}}, associatedInterfacePtrInfo);
+  }
+
+  Associated{{interface.name}}Ptr.prototype =
+      Object.create({{interface.name}}Ptr.prototype);
+  Associated{{interface.name}}Ptr.prototype.constructor =
+      Associated{{interface.name}}Ptr;
+
   function {{interface.name}}Proxy(receiver) {
     this.receiver_ = receiver;
   }
 
 {%- for method in interface.methods %}
   {{interface.name}}Ptr.prototype.{{method.name|stylize_method}} = function() {
     return {{interface.name}}Proxy.prototype.{{method.name|stylize_method}}
         .apply(this.ptr.getProxy(), arguments);
   };
 
   {{interface.name}}Proxy.prototype.{{method.name|stylize_method}} = function(
 {%- for parameter in method.parameters -%}
 {{parameter.name}}{% if not loop.last %}, {% endif %}
 {%- endfor -%}
 ) {
     var params = new {{interface.name}}_{{method.name}}_Params();
 {%- for parameter in method.parameters %}
     params.{{parameter.name}} = {{parameter.name}};
 {%- endfor %}
 
 {%- if method.response_parameters == None %}
-    var builder = new codec.MessageBuilder(
+{%-   if method|method_passes_associated_kinds and not use_new_js_bindings %}
+    var builder = new codec.MessageV2Builder(
+        k{{interface.name}}_{{method.name}}_Name,
+        codec.align({{interface.name}}_{{method.name}}_Params.encodedSize));
+    builder.setPayload({{interface.name}}_{{method.name}}_Params, params);
+{%-   else %}
+    var builder = new codec.MessageV0Builder(
         k{{interface.name}}_{{method.name}}_Name,
         codec.align({{interface.name}}_{{method.name}}_Params.encodedSize));
     builder.encodeStruct({{interface.name}}_{{method.name}}_Params, params);
+{%-   endif %}
     var message = builder.finish();
     this.receiver_.accept(message);
 {%- else %}
     return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageWithRequestIDBuilder(
+{%-   if method|method_passes_associated_kinds and not use_new_js_bindings %}
+      var builder = new codec.MessageV2Builder(
+          k{{interface.name}}_{{method.name}}_Name,
+          codec.align({{interface.name}}_{{method.name}}_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.setPayload({{interface.name}}_{{method.name}}_Params, params);
+{%-   else %}
+      var builder = new codec.MessageV1Builder(
           k{{interface.name}}_{{method.name}}_Name,
           codec.align({{interface.name}}_{{method.name}}_Params.encodedSize),
           codec.kMessageExpectsResponse, 0);
       builder.encodeStruct({{interface.name}}_{{method.name}}_Params, params);
+{%-   endif %}
       var message = builder.finish();
       this.receiver_.acceptAndExpectResponse(message).then(function(message) {
         var reader = new codec.MessageReader(message);
         var responseParams =
             reader.decodeStruct({{interface.name}}_{{method.name}}_ResponseParams);
         resolve(responseParams);
       }).catch(function(result) {
         reject(Error("Connection error: " + result));
       });
     }.bind(this));
@@ skipping 41 matching lines @@
       var params = reader.decodeStruct({{interface.name}}_{{method.name}}_Params);
       this.{{method.name|stylize_method}}(
 {%- for parameter in method.parameters -%}
 params.{{parameter.name}}{% if not loop.last %}, {% endif -%}
 {%- endfor %}).then(function(response) {
         var responseParams =
             new {{interface.name}}_{{method.name}}_ResponseParams();
 {%-     for parameter in method.response_parameters %}
         responseParams.{{parameter.name}} = response.{{parameter.name}};
 {%-     endfor %}
-        var builder = new codec.MessageWithRequestIDBuilder(
+{%- if method|method_passes_associated_kinds and not use_new_js_bindings %}
+        var builder = new codec.MessageV2Builder(
+            k{{interface.name}}_{{method.name}}_Name,
+            codec.align({{interface.name}}_{{method.name}}_ResponseParams
+                .encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.setPayload({{interface.name}}_{{method.name}}_ResponseParams,
+                             responseParams);
+{%- else %}
+        var builder = new codec.MessageV1Builder(
             k{{interface.name}}_{{method.name}}_Name,
             codec.align({{interface.name}}_{{method.name}}_ResponseParams.encodedSize),
             codec.kMessageIsResponse, reader.requestID);
         builder.encodeStruct({{interface.name}}_{{method.name}}_ResponseParams,
                              responseParams);
+{%- endif %}
         var message = builder.finish();
         responder.accept(message);
       });
       return true;
 {%- endif %}
 {%- endfor %}
     default:
       return false;
     }
   };
@@ skipping 68 matching lines @@
 {%- from "enum_definition.tmpl" import enum_def -%}
 {%- for enum in interface.enums %}
   {{ enum_def("%s.%s"|format(interface.name, enum.name), enum) }}
 {%-  endfor %}
   {{interface.name}}Stub.prototype.validator = validate{{interface.name}}Request;
 {%- if interface|has_callbacks %}
   {{interface.name}}Proxy.prototype.validator = validate{{interface.name}}Response;
 {%- else %}
   {{interface.name}}Proxy.prototype.validator = null;
 {%- endif %}