Revert of Mojo JavaScript bindings: follow JavaScript naming rules.

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
 import os
@@ skipping 74 matching lines @@
   # Strings are serialized as variable-length arrays.
   if (mojom.IsStringKind(kind)):
     expected_dimension_sizes.append(0)
   return expected_dimension_sizes
 
 
 def GetRelativePath(module, base_module):
   return os.path.relpath(module.path, os.path.dirname(base_module.path))
 
 
-class JavaScriptStylizer(generator.Stylizer):
-  def __init__(self, use_new_js_bindings):
-    self.use_new_js_bindings = use_new_js_bindings
-
-  def StylizeField(self, mojom_name):
-    if not self.use_new_js_bindings:
-      return mojom_name
-    return generator.ToCamel(mojom_name, lower_initial=True)
-
-  def StylizeParameter(self, mojom_name):
-    if not self.use_new_js_bindings:
-      return mojom_name
-    return generator.ToCamel(mojom_name, lower_initial=True)
-
-  def StylizeMethod(self, mojom_name):
-    return generator.ToCamel(mojom_name, lower_initial=True)
-
-  def StylizeModule(self, mojom_namespace):
-    if not self.use_new_js_bindings:
-      return mojom_namespace
-    return '.'.join(generator.ToCamel(word, lower_initial=True)
-                        for word in mojom_namespace.split('.'))
-
-
 class Generator(generator.Generator):
   def _GetParameters(self):
     return {
       "enums": self.module.enums,
       "imports": self.module.imports,
       "interfaces": self.module.interfaces,
       "kinds": self.module.kinds,
       "module": self.module,
       "structs": self.module.structs + self._GetStructsFromMethods(),
       "unions": self.module.unions,
@@ skipping 24 matching lines @@
       "is_interface_kind": mojom.IsInterfaceKind,
       "is_interface_request_kind": mojom.IsInterfaceRequestKind,
       "is_map_kind": mojom.IsMapKind,
       "is_object_kind": mojom.IsObjectKind,
       "is_string_kind": mojom.IsStringKind,
       "is_struct_kind": mojom.IsStructKind,
       "is_union_kind": mojom.IsUnionKind,
       "js_type": self._JavaScriptType,
       "method_passes_associated_kinds": mojom.MethodPassesAssociatedKinds,
       "payload_size": JavaScriptPayloadSize,
+      "stylize_method": lambda x: generator.ToCamel(x, lower_initial=True),
       "to_camel": generator.ToCamel,
       "union_decode_snippet": self._JavaScriptUnionDecodeSnippet,
       "union_encode_snippet": self._JavaScriptUnionEncodeSnippet,
       "validate_array_params": self._JavaScriptValidateArrayParams,
       "validate_enum_params": self._JavaScriptValidateEnumParams,
       "validate_map_params": self._JavaScriptValidateMapParams,
       "validate_nullable_params": self._JavaScriptNullableParam,
       "validate_struct_params": self._JavaScriptValidateStructParams,
       "validate_union_params": self._JavaScriptValidateUnionParams,
     }
     return js_filters
 
   @UseJinja("module.amd.tmpl")
   def _GenerateAMDModule(self):
     return self._GetParameters()
 
   def GenerateFiles(self, args):
     if self.variant:
       raise Exception("Variants not supported in JavaScript bindings.")
 
-    self.module.Stylize(JavaScriptStylizer(self.use_new_js_bindings))
+    # TODO(yzshen): Add a JavaScriptStylizer.
+    self.module.Stylize(generator.Stylizer())
 
     # TODO(yzshen): Remove this method once the old JS bindings go away.
     self._SetUniqueNameForImports()
 
     self.Write(self._GenerateAMDModule(), "%s.js" % self.module.path)
 
   def _SetUniqueNameForImports(self):
     used_names = set()
     for each_import in self.module.imports:
       simple_name = os.path.basename(each_import.path).split(".")[0]
@@ skipping 204 matching lines @@
     return self._TranslateConstants(value)
 
   def _GetStructsFromMethods(self):
     result = []
     for interface in self.module.interfaces:
       for method in interface.methods:
         result.append(method.param_struct)
         if method.response_param_struct is not None:
           result.append(method.response_param_struct)
     return result