[DevTools] Roll inspector_protocol

New revision: 50a14c3884caf012f3a5fc666d5eb8033d8a184a

Change-Id: I7b4b99e8ec537373d3ec5b1390461824e58285b2
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1603217Reviewed-by: Alexei Filippov <alph@chromium.org>
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61394}

third_party/inspector_protocol/README.v8

@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: 2039736177ee11d96a096cdab9c58cc1d78faa43
+Revision: 50a14c3884caf012f3a5fc666d5eb8033d8a184a
 License: BSD
 License File: LICENSE
 Security Critical: no

third_party/inspector_protocol/encoding/encoding.cc

@@ -2106,10 +2106,8 @@ Status ConvertCBORToJSON(const Platform& platform,
   return ConvertCBORToJSONTmpl(platform, cbor, json);
 }
 
-template <typename C>
-Status ConvertJSONToCBORTmpl(const Platform& platform,
-                             span<uint8_t> json,
-                             C* cbor) {
+template <typename T, typename C>
+Status ConvertJSONToCBORTmpl(const Platform& platform, span<T> json, C* cbor) {
   Status status;
   std::unique_ptr<StreamingParserHandler> encoder =
       cbor::NewCBOREncoder(cbor, &status);
@@ -2121,10 +2119,20 @@ Status ConvertJSONToCBOR(const Platform& platform,
                          std::string* cbor) {
   return ConvertJSONToCBORTmpl(platform, json, cbor);
 }
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::string* cbor) {
+  return ConvertJSONToCBORTmpl(platform, json, cbor);
+}
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::vector<uint8_t>* cbor) {
   return ConvertJSONToCBORTmpl(platform, json, cbor);
 }
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::vector<uint8_t>* cbor) {
+  return ConvertJSONToCBORTmpl(platform, json, cbor);
+}
 }  // namespace json
 }  // namespace v8_inspector_protocol_encoding

third_party/inspector_protocol/encoding/encoding.h

@@ -496,9 +496,15 @@ Status ConvertCBORToJSON(const Platform& platform,
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::vector<uint8_t>* cbor);
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::vector<uint8_t>* cbor);
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::string* cbor);
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::string* cbor);
 }  // namespace json
 }  // namespace v8_inspector_protocol_encoding
 

third_party/inspector_protocol/encoding/encoding_test.cc

@@ -782,8 +782,8 @@ TEST(ParseCBORTest, ParseEmptyCBORMessage) {
 TEST(ParseCBORTest, ParseCBORHelloWorld) {
   const uint8_t kPayloadLen = 27;
   std::vector<uint8_t> bytes = {0xd8, 0x5a, 0, 0, 0, kPayloadLen};
-  bytes.push_back(0xbf);                   // start indef length map.
-  EncodeString8(SpanFrom("msg"), &bytes);  // key: msg
+  bytes.push_back(0xbf);                            // start indef length map.
+  EncodeString8(SpanFrom("msg"), &bytes);           // key: msg
   // Now write the value, the familiar "Hello, 🌎." where the globe is expressed
   // as two utf16 chars.
   bytes.push_back(/*major type=*/2 << 5 | /*additional info=*/20);
@@ -1788,5 +1788,29 @@ TYPED_TEST(ConvertJSONToCBORTest, RoundTripValidJson) {
   }
   EXPECT_EQ(json, roundtrip_json);
 }
+
+TYPED_TEST(ConvertJSONToCBORTest, RoundTripValidJson16) {
+  std::vector<uint16_t> json16 = {
+      '{', '"', 'm', 's',    'g',    '"', ':', '"', 'H', 'e', 'l', 'l',
+      'o', ',', ' ', 0xd83c, 0xdf0e, '.', '"', ',', '"', 'l', 's', 't',
+      '"', ':', '[', '1',    ',',    '2', ',', '3', ']', '}'};
+  TypeParam cbor;
+  {
+    Status status = ConvertJSONToCBOR(
+        GetTestPlatform(), span<uint16_t>(json16.data(), json16.size()), &cbor);
+    EXPECT_EQ(Error::OK, status.error);
+    EXPECT_EQ(Status::npos(), status.pos);
+  }
+  TypeParam roundtrip_json;
+  {
+    Status status =
+        ConvertCBORToJSON(GetTestPlatform(), SpanFrom(cbor), &roundtrip_json);
+    EXPECT_EQ(Error::OK, status.error);
+    EXPECT_EQ(Status::npos(), status.pos);
+  }
+  std::string json = "{\"msg\":\"Hello, \\ud83c\\udf0e.\",\"lst\":[1,2,3]}";
+  TypeParam expected_json(json.begin(), json.end());
+  EXPECT_EQ(expected_json, roundtrip_json);
+}
 }  // namespace json
 }  // namespace v8_inspector_protocol_encoding

third_party/inspector_protocol/lib/encoding_cpp.template

@@ -2113,10 +2113,8 @@ Status ConvertCBORToJSON(const Platform& platform,
   return ConvertCBORToJSONTmpl(platform, cbor, json);
 }
 
-template <typename C>
-Status ConvertJSONToCBORTmpl(const Platform& platform,
-                             span<uint8_t> json,
-                             C* cbor) {
+template <typename T, typename C>
+Status ConvertJSONToCBORTmpl(const Platform& platform, span<T> json, C* cbor) {
   Status status;
   std::unique_ptr<StreamingParserHandler> encoder =
       cbor::NewCBOREncoder(cbor, &status);
@@ -2128,11 +2126,21 @@ Status ConvertJSONToCBOR(const Platform& platform,
                          std::string* cbor) {
   return ConvertJSONToCBORTmpl(platform, json, cbor);
 }
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::string* cbor) {
+  return ConvertJSONToCBORTmpl(platform, json, cbor);
+}
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::vector<uint8_t>* cbor) {
   return ConvertJSONToCBORTmpl(platform, json, cbor);
 }
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::vector<uint8_t>* cbor) {
+  return ConvertJSONToCBORTmpl(platform, json, cbor);
+}
 }  // namespace json
 
 {% for namespace in config.protocol.namespace %}

third_party/inspector_protocol/lib/encoding_h.template

@@ -504,9 +504,15 @@ Status ConvertCBORToJSON(const Platform& platform,
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::vector<uint8_t>* cbor);
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::vector<uint8_t>* cbor);
 Status ConvertJSONToCBOR(const Platform& platform,
                          span<uint8_t> json,
                          std::string* cbor);
+Status ConvertJSONToCBOR(const Platform& platform,
+                         span<uint16_t> json,
+                         std::string* cbor);
 }  // namespace json
 
 {% for namespace in config.protocol.namespace %}