JSON compiler to include "customBindings" in the function name.

tools/json_schema_compiler/cpp_bundle_generator.py

 # Copyright (c) 2012 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 code
 import cpp_util
 from model import Platforms
 from schema_util import CapitalizeFirstLetter
 from schema_util import JsFunctionNameToClassName
 
@@ skipping 64 matching lines @@
     if model_object.platforms is None:
       return None
     ifdefs = []
     for platform in model_object.platforms:
       if platform == Platforms.CHROMEOS:
         ifdefs.append('defined(OS_CHROMEOS)')
       else:
         raise ValueError("Unsupported platform ifdef: %s" % platform.name)
     return ' and '.join(ifdefs)
 
-  def _GetNamespaceFunctions(self, namespace):
-    functions = list(namespace.functions.values())
-    if namespace.compiler_options.get("generate_type_functions", False):
-      for type_ in namespace.types.values():
-        functions += list(type_.functions.values())
-    return functions
+  def _GenerateRegisterFunctions(self, namespace_name, function):
+    c = code.Code()
+    function_ifdefs = self._GetPlatformIfdefs(function)
+    if function_ifdefs is not None:
+      c.Append("#if %s" % function_ifdefs, indent_level=0)
+
+    function_name = JsFunctionNameToClassName(namespace_name, function.name)
+    c.Append("registry->RegisterFunction<%sFunction>();" % (
+        function_name))
+
+    if function_ifdefs is not None:
+      c.Append("#endif  // %s" % function_ifdefs, indent_level=0)
+    return c
 
   def _GenerateFunctionRegistryRegisterAll(self):
     c = code.Code()
     c.Append('// static')
     c.Sblock('void GeneratedFunctionRegistry::RegisterAll('
                  'ExtensionFunctionRegistry* registry) {')
     for namespace in self._model.namespaces.values():
       namespace_ifdefs = self._GetPlatformIfdefs(namespace)
       if namespace_ifdefs is not None:
         c.Append("#if %s" % namespace_ifdefs, indent_level=0)
 
       namespace_name = CapitalizeFirstLetter(namespace.name.replace(
           "experimental.", ""))
-      for function in self._GetNamespaceFunctions(namespace):
+      for function in namespace.functions.values():
         if function.nocompile:
           continue
-        function_ifdefs = self._GetPlatformIfdefs(function)
-        if function_ifdefs is not None:
-          c.Append("#if %s" % function_ifdefs, indent_level=0)
+        c.Concat(self._GenerateRegisterFunctions(namespace.name, function))
 
-        function_name = JsFunctionNameToClassName(namespace.name, function.name)
-        c.Append("registry->RegisterFunction<%sFunction>();" % (
-            function_name))
-
-        if function_ifdefs is not None:
-          c.Append("#endif  // %s" % function_ifdefs, indent_level=0)
+      for type_ in namespace.types.values():
+        for function in type_.functions.values():
+          if function.nocompile:
+            continue
+          namespace_types_name = JsFunctionNameToClassName(
+                namespace.name, type_.name)
+          c.Concat(self._GenerateRegisterFunctions(namespace_types_name,
+                                                   function))
 
       if namespace_ifdefs is not None:
         c.Append("#endif  // %s" % namespace_ifdefs, indent_level=0)
     c.Eblock("}")
     return c
 
 class _APIHGenerator(object):
   """Generates the header for API registration / declaration"""
   def __init__(self, cpp_bundle):
     self._bundle = cpp_bundle
@@ skipping 114 matching lines @@
                                 separators=(',', ':'))
       # Escape all double-quotes and backslashes. For this to output a valid
       # JSON C string, we need to escape \ and ".
       json_content = json_content.replace('\\', '\\\\').replace('"', '\\"')
       c.Append('(*schemas)["%s"] = "%s";' % (namespace.name, json_content))
     c.Eblock('}')
     c.Append()
     c.Concat(cpp_util.CloseNamespace(self._bundle._cpp_namespace))
     c.Append()
     return c