[DevTools] Added browser protocol to handler generator

content/browser/devtools/protocol/devtools_protocol_handler_generator.py

 #!/usr/bin/env python
 # Copyright 2014 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 sys
 import string
 import json
 
-input_json_path = sys.argv[1]
-output_cc_path = sys.argv[2]
-output_h_path = sys.argv[3]
+blink_protocol_path = sys.argv[1]
+browser_protocol_path = sys.argv[2]
+output_cc_path = sys.argv[3]
+output_h_path = sys.argv[4]
 
 header = """\
 // Copyright 2014 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.
 
 // THIS FILE IS AUTOGENERATED. DO NOT EDIT.
 // Generated by
 //  content/public/browser/devtools_protocol_handler_generator.py from
 //  third_party/WebKit/Source/devtools/protocol.json
@@ skipping 389 matching lines @@
 """)
 
 tmpl_wrap_dict = string.Template("""\
   ${dict_var}->Set("${proto_param}",
       ${param_type}::ToValue(${var_name}.Pass()).release());
 """)
 
 tmpl_wrap_list = tmpl_wrap_dict;
 
 tmpl_wrap_obj = string.Template("""\
-  ${dict_var}->Set("${proto_param}", ${var_name});
+  ${dict_var}->Set("${proto_param}", ${var_name}.release());

[dgozman, 2014/10/17 13:11:28]

Should this go to previous patch?

[vkuzkokov, 2014/10/17 15:53:17]

Done.

 """)
 
 tmpl_typename = string.Template("devtools::${domain}::${declared_name}")
 
 def Capitalize(s):
   return s[:1].upper() + s[1:]
 
 def Decapitalize(s):
   return s.lower()
 
 def Uncamelcase(s):
   result = ""
   for i, c in enumerate(s):
     if c.isupper():
       if (i > 0) and ((i < len(s)-1) and s[i+1].islower() or s[i-1].islower()):
         result += "_"
       result += c.lower()
     else:
       result += c
   return result
 
 types = {}
-json_api = json.loads(open(input_json_path, "r").read())
+blink_protocol = json.loads(open(blink_protocol_path, "r").read())
+browser_protocol = json.loads(open(browser_protocol_path, "r").read())
 type_decls = []
 type_impls = []
 handler_methods = []
 handler_method_impls = []
 
-for json_domain in json_api["domains"]:
+all_domains = blink_protocol["domains"] + browser_protocol["domains"]
+
+for json_domain in all_domains:
   if "types" in json_domain:
     for json_type in json_domain["types"]:
       types["%s.%s" % (json_domain["domain"], json_type["id"])] = json_type
 
 def DeclareStruct(json_properties, mapping):
   methods = []
   fields = []
   fields_init = []
   method_impls = []
   dchecks = []
@@ skipping 27 matching lines @@
   dot_pos = json["$ref"].find(".")
   if dot_pos == -1:
     domain_name = mapping["Domain"]
     type_name = json["$ref"]
   else:
     domain_name = json["$ref"][:dot_pos]
     type_name = json["$ref"][dot_pos + 1:]
   json_type = types["%s.%s" % (domain_name, type_name)]
   mapping["declared_name"] = Capitalize(type_name)
   mapping["Domain"] = domain_name
-  mapping["domain"] = Decapitalize(domain_name)
+  mapping["domain"] = Uncamelcase(domain_name)

[dgozman, 2014/10/17 13:11:28]

ditto

[vkuzkokov, 2014/10/17 15:53:17]

Done.

   mapping["param_type"] = tmpl_typename.substitute(mapping)
   if json_type.get("enum"):
     # TODO(vkuzkokov) Implement. Approximate template:
     # namespace ${domain} { const char k${declared_name}${Value}; }
     raise Exception("Named enumerations are not implemented")
   ResolveType(json_type, mapping)
   if not "___struct_declared" in json_type:
     json_type["___struct_declared"] = True;
     if (json_type.get("type") == "object") and ("properties" in json_type):
       DeclareStruct(json_type["properties"], mapping)
@@ skipping 91 matching lines @@
   else:
     raise Exception("Unknown type at %s.%s %s" %
         (mapping["Domain"], mapping["command"], mapping["proto_param"]))
 
 setters = []
 fields = []
 
 includes = []
 fields_init = []
 
-for json_domain in json_api["domains"]:
+for json_domain in all_domains:
   domain_map = {}
   domain_map["Domain"] = json_domain["domain"]
-  domain_map["domain"] = Decapitalize(json_domain["domain"])
+  domain_map["domain"] = Uncamelcase(json_domain["domain"])

[dgozman, 2014/10/17 13:11:28]

ditto

[vkuzkokov, 2014/10/17 15:53:17]

Done.

 
   initializations = []
   client_methods = []
   client_method_impls = []
   domain_empty = True
   domain_needs_client = False
 
   if "commands" in json_domain:
     for json_command in json_domain["commands"]:
       if (not ("handlers" in json_command) or
@@ skipping 126 matching lines @@
     methods = "".join(handler_methods),
     fields = "".join(fields)))
 output_h_file.close()
 
 output_cc_file.write(template_cc.substitute({},
     includes = "".join(sorted(includes)),
     fields_init = ",\n      ".join(fields_init),
     methods = "\n".join(handler_method_impls),
     types = "\n".join(type_impls)))
 output_cc_file.close()