[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

[dgozman, 2014/11/11 10:38:46]

nit: list browser protocol here.

[vkuzkokov, 2014/11/11 11:06:00]

Done.

 """
 
 template_h = string.Template(header + """\
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_HANDLER_IMPL_H_
 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_HANDLER_IMPL_H_
 
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/protocol/devtools_protocol_client.h"
 
@@ skipping 387 matching lines @@
   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_enum = []
   enum_items = []
   req_fields_num = 0
   for json_prop in json_properties:
@@ skipping 135 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"] = Uncamelcase(json_domain["domain"])
 
   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
           not ("browser" in json_command["handlers"])):
         continue
       domain_empty = False
 
       command_map = domain_map.copy()
       command_map["command"] = json_command["name"]
       command_map["Command"] = Capitalize(json_command["name"])
 
       prep = []
       args = []
 
       if "parameters" in json_command:
         for json_param in json_command["parameters"]:
           param_map = command_map.copy()
           param_map["proto_param"] = json_param["name"]
           param_map["param"] = Uncamelcase(json_param["name"])
-
           ResolveType(json_param, param_map)
           if len(prep) == 0:
             prep.append(params_prep)
           if json_param.get("optional"):
             if param_map["Type"] in ["List", "Dictionary"]:
               # TODO(vkuzkokov) Implement transformation of base::ListValue
               # to std::vector and base::DictonaryValue to struct.
               raise Exception(
                   "Optional array and object parameters are not implemented")
             prep.append(tmpl_prep_opt.substitute(param_map))
@@ skipping 19 matching lines @@
                 args = "\n      " + ",\n      ".join(args)))
         client_methods.append(tmpl_response.substitute(command_map))
         client_method_impls.append(tmpl_response_impl.substitute(command_map))
       else:
         wrap = []
         if "returns" in json_command:
           for json_param in json_command["returns"]:
             param_map = command_map.copy()
             param_map["proto_param"] = json_param["name"]
             param_map["param"] = Uncamelcase(json_param["name"])
-
             if json_param.get("optional"):
               # TODO(vkuzkokov) Implement Optional<T> for value types.
               raise Exception("Optional return values are not implemented")
             ResolveType(json_param, param_map)
             prep.append(tmpl_prep_output.substitute(param_map))
             args.append(param_map["arg_out"])
             wrap.append(tmpl_wrap.substitute(param_map))
-
         args_str = ""
         if len(args) > 0:
           args_str = "\n      " + ",\n      ".join(args)
         handler_method_impls.append(tmpl_callback_impl.substitute(command_map,
             prep = "".join(prep),
             args = args_str,
             wrap = "".join(wrap)))
 
       initializations.append(tmpl_register.substitute(command_map))
       handler_methods.append(tmpl_callback.substitute(command_map))
@@ skipping 45 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()