squash! fix build

bnoordhuis · bnoordhuis · commit 4ac1158716f2 · 2019-05-20T14:57:56.000+02:00
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
@@ -73,7 +73,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/code_generator.py b/tools/inspector_protocol/code_generator.py
@@ -36,9 +36,9 @@ def unicode(s, *_):
 
 def read_config():
     # pylint: disable=W0703
-    def json_to_object(data, output_base, config_base):
+    def json_to_object(data, output_base):
         def json_object_hook(object_dict):
-            items = [(k, os.path.join(config_base, v) if k == "path" else v) for (k, v) in object_dict.items()]
+            items = [(k, os.path.join(output_base, v) if k == "path" else v) for (k, v) in object_dict.items()]
             items = [(k, os.path.join(output_base, v) if k == "output" else v) for (k, v) in items]
             keys, values = list(zip(*items))
             return collections.namedtuple('X', keys)(*values)
@@ -69,7 +69,6 @@ def init_defaults(config_tuple, path, defaults):
         jinja_dir = arg_options.jinja_dir
         output_base = arg_options.output_base
         config_file = arg_options.config
-        config_base = os.path.dirname(config_file)
         config_values = arg_options.config_value
     except Exception:
         # Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
@@ -80,7 +79,7 @@ def init_defaults(config_tuple, path, defaults):
     try:
         config_json_file = open(config_file, "r")
         config_json_string = config_json_file.read()
-        config_partial = json_to_object(config_json_string, output_base, config_base)
+        config_partial = json_to_object(config_json_string, output_base)
         config_json_file.close()
         defaults = {
             ".use_snake_file_names": False,

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class SendMessageRequest : public Request {`
`73`	`73`	`if (frontend_wrapper == nullptr) return;`
`74`	`74`	`auto frontend = frontend_wrapper->get();`
`75`	`75`	`if (frontend != nullptr) {`
`76`		`- frontend->sendRawNotification(message_);`
	`76`	`+ frontend->sendRawJSONNotification(message_);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`