Associated Message Validation

mojo/public/tools/bindings/generators/mojom_js_generator.py

Index: mojo/public/tools/bindings/generators/mojom_js_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_js_generator.py b/mojo/public/tools/bindings/generators/mojom_js_generator.py
index ab9635ee300a8a6b503d144ec2122508350e4b3b..0c9ad38bc481b6bdc3da04856f97618c92689e4a 100644
--- a/mojo/public/tools/bindings/generators/mojom_js_generator.py
+++ b/mojo/public/tools/bindings/generators/mojom_js_generator.py
@@ -67,8 +67,10 @@ def JavaScriptDefaultValue(field):
     return "new %sPtr()" % JavaScriptType(field.kind)
   if mojom.IsInterfaceRequestKind(field.kind):
     return "new bindings.InterfaceRequest()"
-  if mojom.IsAssociatedKind(field.kind):
-    return "null"
+  if mojom.IsAssociatedInterfaceKind(field.kind):
+    return "new associatedBindings.AssociatedInterfacePtrInfo()"
+  if mojom.IsAssociatedInterfaceRequestKind(field.kind):
+    return "new associatedBindings.AssociatedInterfaceRequest()"
   if mojom.IsEnumKind(field.kind):
     return "0"
   raise Exception("No valid default: %s" % field)
@@ -134,9 +136,13 @@ def CodecType(kind):
         "NullableInterfaceRequest" if mojom.IsNullableKind(kind)
                                    else "InterfaceRequest")
   if mojom.IsAssociatedInterfaceKind(kind):
-    return "codec.AssociatedInterfaceNotSupported"
+    return "codec.%s" % (
+        "NullableAssociatedInterfacePtrInfo" if mojom.IsNullableKind(kind)
+                                   else "AssociatedInterfacePtrInfo")

[yzshen1, 2017/04/11 06:23:11]

"else" should align with "if" on the previous line, or maybe 4 more spaces than
"NullableAssociatedInterfacePtrInfo" on the previous line.

[wangjimmy, 2017/04/12 00:26:17]

Done.

   if mojom.IsAssociatedInterfaceRequestKind(kind):
-    return "codec.AssociatedInterfaceRequestNotSupported"
+    return "codec.%s" % (
+        "NullableAssociatedInterfaceRequest" if mojom.IsNullableKind(kind)
+                                   else "AssociatedInterfaceRequest")

[yzshen1, 2017/04/11 06:23:11]

ditto.

[wangjimmy, 2017/04/12 00:26:17]

Done.

   if mojom.IsEnumKind(kind):
     return "new codec.Enum(%s)" % JavaScriptType(kind)
   if mojom.IsMapKind(kind):
@@ -310,6 +316,12 @@ def IsInterfaceField(field):
 def IsInterfaceRequestField(field):
   return mojom.IsInterfaceRequestKind(field.kind)
 
+def IsAssociatedInterfaceField(field):
+  return mojom.IsAssociatedInterfaceKind(field.kind)
+
+def IsAssociatedInterfaceRequestField(field):
+  return mojom.IsAssociatedInterfaceRequestKind(field.kind)
+
 def IsUnionField(field):
   return mojom.IsUnionKind(field.kind)
 
@@ -340,6 +352,8 @@ class Generator(generator.Generator):
     "has_callbacks": mojom.HasCallbacks,
     "is_any_handle_or_interface_field": IsAnyHandleOrInterfaceField,
     "is_array_pointer_field": IsArrayPointerField,
+    "is_associated_interface_field": IsAssociatedInterfaceField,
+    "is_associated_interface_request_field": IsAssociatedInterfaceRequestField,
     "is_bool_field": IsBoolField,
     "is_enum_field": IsEnumField,
     "is_handle_field": IsHandleField,