tools: update inspector_protocol to 0aafd2

Co-authored-by: Ben Noordhuis <info@bnoordhuis.nl> PR-URL: #27770 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · targos · Jun 4, 2019 · May 17, 2019 · May 20, 2019 · May 17, 2019
commit a75a59d3e3695152bc0ed10fa58355813f0179ca
diff --git a/src/inspector/node_inspector.gypi b/src/inspector/node_inspector.gypi
@@ -15,9 +15,12 @@
     'node_protocol_files': [
       '<(protocol_tool_path)/lib/Allocator_h.template',
       '<(protocol_tool_path)/lib/Array_h.template',
-      '<(protocol_tool_path)/lib/Collections_h.template',
+      '<(protocol_tool_path)/lib/base_string_adapter_cc.template',
+      '<(protocol_tool_path)/lib/base_string_adapter_h.template',
       '<(protocol_tool_path)/lib/DispatcherBase_cpp.template',
       '<(protocol_tool_path)/lib/DispatcherBase_h.template',
+      '<(protocol_tool_path)/lib/encoding_cpp.template',
+      '<(protocol_tool_path)/lib/encoding_h.template',
       '<(protocol_tool_path)/lib/ErrorSupport_cpp.template',
       '<(protocol_tool_path)/lib/ErrorSupport_h.template',
       '<(protocol_tool_path)/lib/Forward_h.template',

diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc
@@ -107,6 +107,22 @@ String fromUTF8(const uint8_t* data, size_t length) {
   return std::string(reinterpret_cast<const char*>(data), length);
 }
 
+String fromUTF16(const uint16_t* data, size_t length) {
+  icu::UnicodeString utf16(reinterpret_cast<const char16_t*>(data), length);
+  std::string result;
+  return utf16.toUTF8String(result);
+}
+
+const uint8_t* CharactersUTF8(const String& s) {
+  return reinterpret_cast<const uint8_t*>(s.data());
+}
+
+size_t CharacterCount(const String& s) {
+  icu::UnicodeString utf16 =
+      icu::UnicodeString::fromUTF8(icu::StringPiece(s.data(), s.length()));
+  return utf16.countChar32();
+}
+
 }  // namespace StringUtil
 }  // namespace protocol
 }  // namespace inspector

diff --git a/src/inspector/node_string.h b/src/inspector/node_string.h
@@ -20,16 +20,6 @@ using String = std::string;
 using StringBuilder = std::ostringstream;
 using ProtocolMessage = std::string;
 
-class StringUTF8Adapter {
- public:
-  explicit StringUTF8Adapter(const std::string& string) : string_(string) { }
-  const char* Data() const { return string_.data(); }
-  size_t length() const { return string_.length(); }
-
- private:
-  const std::string& string_;
-};
-
 namespace StringUtil {
 // NOLINTNEXTLINE(runtime/references) This is V8 API...
 inline void builderAppend(StringBuilder& builder, char c) {
@@ -82,6 +72,13 @@ std::unique_ptr<Value> parseMessage(const std::string& message, bool binary);
 ProtocolMessage jsonToMessage(String message);
 ProtocolMessage binaryToMessage(std::vector<uint8_t> message);
 String fromUTF8(const uint8_t* data, size_t length);
+String fromUTF16(const uint16_t* data, size_t length);
+const uint8_t* CharactersUTF8(const String& s);
+size_t CharacterCount(const String& s);
+
+// Unimplemented. The generated code will fall back to CharactersUTF8().
+inline uint8_t* CharactersLatin1(const String& s) { return nullptr; }
+inline const uint16_t* CharactersUTF16(const String& s) { return nullptr; }
 
 extern size_t kNotFound;
 }  // namespace StringUtil

diff --git a/src/inspector/tracing_agent.cc b/src/inspector/tracing_agent.cc
@@ -70,7 +70,7 @@ class SendMessageRequest : public Request {
     if (frontend_wrapper == nullptr) return;
     auto frontend = frontend_wrapper->get();
     if (frontend != nullptr) {
-      frontend->sendRawNotification(message_);
+      frontend->sendRawJSONNotification(message_);
     }
   }
 

diff --git a/tools/inspector_protocol/.clang-format b/tools/inspector_protocol/.clang-format
@@ -0,0 +1,36 @@
+# Defines the Chromium style for automatic reformatting.
+# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
+BasedOnStyle: Chromium
+# This defaults to 'Auto'. Explicitly set it for a while, so that
+# 'vector<vector<int> >' in existing files gets formatted to
+# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
+# 'int>>' if the file already contains at least one such instance.)
+Standard: Cpp11
+
+# Make sure code like:
+# IPC_BEGIN_MESSAGE_MAP()
+#   IPC_MESSAGE_HANDLER(WidgetHostViewHost_Update, OnUpdate)
+# IPC_END_MESSAGE_MAP()
+# gets correctly indented.
+MacroBlockBegin: "^\
+BEGIN_MSG_MAP|\
+BEGIN_MSG_MAP_EX|\
+BEGIN_SAFE_MSG_MAP_EX|\
+CR_BEGIN_MSG_MAP_EX|\
+IPC_BEGIN_MESSAGE_MAP|\
+IPC_BEGIN_MESSAGE_MAP_WITH_PARAM|\
+IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN|\
+IPC_STRUCT_BEGIN|\
+IPC_STRUCT_BEGIN_WITH_PARENT|\
+IPC_STRUCT_TRAITS_BEGIN|\
+POLPARAMS_BEGIN|\
+PPAPI_BEGIN_MESSAGE_MAP$"
+MacroBlockEnd: "^\
+CR_END_MSG_MAP|\
+END_MSG_MAP|\
+IPC_END_MESSAGE_MAP|\
+IPC_PROTOBUF_MESSAGE_TRAITS_END|\
+IPC_STRUCT_END|\
+IPC_STRUCT_TRAITS_END|\
+POLPARAMS_END|\
+PPAPI_END_MESSAGE_MAP$"
diff --git a/tools/inspector_protocol/BUILD.gn b/tools/inspector_protocol/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2019 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("encoding") {
+  sources = [
+    "encoding/encoding.cc",
+    "encoding/encoding.h",
+  ]
+}
+
+# encoding_test is part of the unittests, defined in
+# test/unittests/BUILD.gn.
+
+import("../../gni/v8.gni")
+
+v8_source_set("encoding_test") {
+  sources = [
+    "encoding/encoding_test.cc",
+    "encoding/encoding_test_helper.h",
+  ]
+  configs = [
+    "../..:external_config",
+    "../..:internal_config_base",
+  ]
+  deps = [
+    ":encoding",
+    "../..:v8_libbase",
+    "../../src/inspector:inspector_string_conversions",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+  testonly = true
+}
diff --git a/tools/inspector_protocol/README.md b/tools/inspector_protocol/README.md
@@ -0,0 +1,33 @@
+# Chromium inspector (devtools) protocol
+
+This package contains code generators and templates for the Chromium
+inspector protocol.
+
+The canonical location of this package is at
+https://chromium.googlesource.com/deps/inspector_protocol/
+
+In the Chromium tree, it's rolled into
+https://cs.chromium.org/chromium/src/third_party/inspector_protocol/
+
+In the V8 tree, it's rolled into
+https://cs.chromium.org/chromium/src/v8/third_party/inspector_protocol/
+
+See also [Contributing to Chrome Devtools Protocol](https://docs.google.com/document/d/1c-COD2kaK__5iMM5SEx-PzNA7HFmgttcYfOHHX0HaOM/edit).
+
+We're working on enabling standalone builds for parts of this package for
+testing and development, please feel free to ignore this for now.
+But, if you're familiar with
+[Chromium's development process](https://www.chromium.org/developers/contributing-code)
+and have the depot_tools installed, you may use these commands
+to fetch the package (and dependencies) and build and run the tests:
+
+    fetch inspector_protocol
+    cd src
+    gn gen out/Release
+    ninja -C out/Release json_parser_test
+    out/Release/json_parser_test
+
+You'll probably also need to install g++, since Clang uses this to find the
+standard C++ headers. E.g.,
+
+    sudo apt-get install g++-8
diff --git a/tools/inspector_protocol/README.node b/tools/inspector_protocol/README.node
@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: f67ec5180f476830e839226b5ca948e43070fdab
+Revision: 0aafd2876f7485db7b07c513c0457b7cbbbe3304
 License: BSD
 License File: LICENSE
 Security Critical: no

diff --git a/tools/inspector_protocol/code_generator.py b/tools/inspector_protocol/code_generator.py
@@ -5,7 +5,7 @@
 
 import os.path
 import sys
-import optparse
+import argparse
 import collections
 import functools
 import re
@@ -17,6 +17,13 @@
 
 import pdl
 
+try:
+    unicode
+except NameError:
+    # Define unicode for Py3
+    def unicode(s, *_):
+        return s
+
 # Path handling for libraries and templates
 # Paths have to be normalized because Jinja uses the exact template path to
 # determine the hash used in the cache filename, and we need a pre-caching step
@@ -53,27 +60,16 @@ def init_defaults(config_tuple, path, defaults):
         return collections.namedtuple('X', keys)(*values)
 
     try:
-        cmdline_parser = optparse.OptionParser()
-        cmdline_parser.add_option("--output_base")
-        cmdline_parser.add_option("--jinja_dir")
-        cmdline_parser.add_option("--config")
-        cmdline_parser.add_option("--config_value", action="append", type="string")
-        arg_options, _ = cmdline_parser.parse_args()
+        cmdline_parser = argparse.ArgumentParser()
+        cmdline_parser.add_argument("--output_base", type=unicode, required=True)
+        cmdline_parser.add_argument("--jinja_dir", type=unicode, required=True)
+        cmdline_parser.add_argument("--config", type=unicode, required=True)
+        cmdline_parser.add_argument("--config_value", default=[], action="append")
+        arg_options = cmdline_parser.parse_args()
         jinja_dir = arg_options.jinja_dir
-        if not jinja_dir:
-            raise Exception("jinja directory must be specified")
-        jinja_dir = jinja_dir.decode('utf8')
         output_base = arg_options.output_base
-        if not output_base:
-            raise Exception("Base output directory must be specified")
-        output_base = output_base.decode('utf8')
         config_file = arg_options.config
-        if not config_file:
-            raise Exception("Config file name must be specified")
-        config_file = config_file.decode('utf8')
         config_values = arg_options.config_value
-        if not config_values:
-            config_values = []
     except Exception:
         # Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
         exc = sys.exc_info()[1]
@@ -631,7 +627,7 @@ def main():
             "Array_h.template",
             "DispatcherBase_h.template",
             "Parser_h.template",
-            "CBOR_h.template",
+            "encoding_h.template",
         ]
 
         protocol_cpp_templates = [
@@ -641,7 +637,7 @@ def main():
             "Object_cpp.template",
             "DispatcherBase_cpp.template",
             "Parser_cpp.template",
-            "CBOR_cpp.template",
+            "encoding_cpp.template",
         ]
 
         forward_h_templates = [

diff --git a/tools/inspector_protocol/codereview.settings b/tools/inspector_protocol/codereview.settings
@@ -0,0 +1,6 @@
+# This file is used by git-cl to get repository specific information.
+CC_LIST: chromium-reviews@chromium.org
+CODE_REVIEW_SERVER: codereview.chromium.org
+GERRIT_HOST: True
+PROJECT: inspector_protocol
+VIEW_VC: https://chromium.googlesource.com/deps/inspector_protocol/+/
diff --git a/tools/inspector_protocol/convert_protocol_to_json.py b/tools/inspector_protocol/convert_protocol_to_json.py
@@ -4,10 +4,8 @@
 # found in the LICENSE file.
 
 import argparse
-import collections
 import json
 import os.path
-import re
 import sys
 
 import pdl