Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

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

 # Copyright 2013 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.
 
 """Generates JavaScript source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 205 matching lines @@
   nullable = JavaScriptNullableParam(packed_field)
   return "%s, %s" % (JavaScriptFieldOffset(packed_field), nullable)
 
 
 def JavaScriptValidateHandleParams(packed_field):
   nullable = JavaScriptNullableParam(packed_field)
   field_offset = JavaScriptFieldOffset(packed_field)
   return "%s, %s" % (field_offset, nullable)
 
 
+
+
+def JavaScriptProxyMethodParameterValue(parameter):
+  name = parameter.name;
+  if (IsInterfaceParameter(parameter)):
+   type = JavaScriptType(parameter.kind)
+   return "core.isHandle(%s) ? %s : connection.bindProxyClient" \
+       "(%s, %s, %s.client)" % (name, name, name, type, type)
+  if (IsInterfaceRequestParameter(parameter)):
+   type = JavaScriptType(parameter.kind.kind)
+   return "core.isHandle(%s) ? %s : connection.bindProxyClient" \
+       "(%s, %s.client, %s)" % (name, name, name, type, type)
+  return name;
+
+def JavaScriptStubMethodParameterValue(parameter):
+  name = parameter.name;
+  if (IsInterfaceParameter(parameter)):
+   type = JavaScriptType(parameter.kind)
+   return "connection.bindProxyHandle(%s, %s.client, %s)" % (name, type, type)
+  if (IsInterfaceRequestParameter(parameter)):
+   type = JavaScriptType(parameter.kind.kind)
+   return "connection.bindProxyHandle(%s, %s, %s.client)" % (name, type, type)
+  return name;
+
 def TranslateConstants(token):
   if isinstance(token, (mojom.EnumValue, mojom.NamedValue)):
     # Both variable and enum constants are constructed like:
     # NamespaceUid.Struct[.Enum].CONSTANT_NAME
     name = []
     if token.imported_from:
       name.append(token.imported_from["unique_name"])
     if token.parent_kind:
       name.append(token.parent_kind.name)
     if isinstance(token, mojom.EnumValue):
@@ skipping 49 matching lines @@
     "field_offset": JavaScriptFieldOffset,
     "has_callbacks": mojom.HasCallbacks,
     "is_array_pointer_field": IsArrayPointerField,
     "is_map_pointer_field": IsMapPointerField,
     "is_struct_pointer_field": IsStructPointerField,
     "is_string_pointer_field": IsStringPointerField,
     "is_handle_field": IsHandleField,
     "js_type": JavaScriptType,
     "is_interface_request_parameter": IsInterfaceRequestParameter,
     "is_interface_parameter": IsInterfaceParameter,
+    "js_proxy_method_parameter_value": JavaScriptProxyMethodParameterValue,
+    "js_stub_method_parameter_value": JavaScriptStubMethodParameterValue,
     "stylize_method": generator.StudlyCapsToCamel,
     "validate_array_params": JavaScriptValidateArrayParams,
     "validate_handle_params": JavaScriptValidateHandleParams,
     "validate_map_params": JavaScriptValidateMapParams,
     "validate_string_params": JavaScriptValidateStringParams,
     "validate_struct_params": JavaScriptValidateStructParams,
   }
 
   def GetParameters(self):
     return {
@@ skipping 40 matching lines @@
     return self.module.imports
 
   def GetImportedInterfaces(self):
     interface_to_import = {};
     for each_import in self.module.imports:
       for each_interface in each_import["module"].interfaces:
         name = each_interface.name
         interface_to_import[name] = each_import["unique_name"] + "." + name
     return interface_to_import;