Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b788209

Browse filesBrowse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update inspector_protocol to af7f5a8173fdbc29f0835ec94395932e328b
PR-URL: #60312 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 696c20b commit b788209
Copy full SHA for b788209

File tree

Expand file treeCollapse file tree

11 files changed

+116
-106
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

11 files changed

+116
-106
lines changed
Open diff view settings
Collapse file

‎deps/inspector_protocol/README.node‎

Copy file name to clipboardExpand all lines: deps/inspector_protocol/README.node
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: inspector protocol
22
Short Name: inspector_protocol
33
URL: https://chromium.googlesource.com/deps/inspector_protocol/
44
Version: 0
5-
Revision: 69d69ddf3aa698b171886551a4a672c5af1ad902
5+
Revision: af7f5a8173fdbc29f0835ec94395932e328b2ea2
66
License: BSD
77
License File: LICENSE
88
Security Critical: no
Collapse file

‎deps/inspector_protocol/crdtp/cbor.cc‎

Copy file name to clipboardExpand all lines: deps/inspector_protocol/crdtp/cbor.cc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ void ParseUTF16String(CBORTokenizer* tokenizer, ParserHandler* out) {
833833
span<uint8_t> rep = tokenizer->GetString16WireRep();
834834
for (size_t ii = 0; ii < rep.size(); ii += 2)
835835
value.push_back((rep[ii + 1] << 8) | rep[ii]);
836-
out->HandleString16(span<uint16_t>(value.data(), value.size()));
836+
out->HandleString16(value);
837837
tokenizer->Next();
838838
}
839839

@@ -1037,7 +1037,7 @@ void ParseCBOR(span<uint8_t> bytes, ParserHandler* out) {
10371037
Status AppendString8EntryToCBORMap(span<uint8_t> string8_key,
10381038
span<uint8_t> string8_value,
10391039
std::vector<uint8_t>* cbor) {
1040-
span<uint8_t> bytes(cbor->data(), cbor->size());
1040+
span<uint8_t> bytes(*cbor);
10411041
CBORTokenizer tokenizer(bytes);
10421042
if (tokenizer.TokenTag() == CBORTokenTag::ERROR_VALUE)
10431043
return tokenizer.Status();
Collapse file

‎deps/inspector_protocol/crdtp/cbor_test.cc‎

Copy file name to clipboardExpand all lines: deps/inspector_protocol/crdtp/cbor_test.cc
+32-32Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ TEST(EncodeDecodeString16Test, RoundtripsHelloWorld) {
349349
std::array<uint16_t, 10> msg{
350350
{'H', 'e', 'l', 'l', 'o', ',', ' ', 0xd83c, 0xdf0e, '.'}};
351351
std::vector<uint8_t> encoded;
352-
EncodeString16(span<uint16_t>(msg.data(), msg.size()), &encoded);
352+
EncodeString16(msg, &encoded);
353353
// This will be encoded as BYTE_STRING of length 20, so the 20 is encoded in
354354
// the additional info part of the initial byte. Payload is two bytes for each
355355
// UTF16 character.
@@ -384,7 +384,7 @@ TEST(EncodeDecodeString16Test, Roundtrips500) {
384384
for (uint16_t ii = 0; ii < 250; ++ii)
385385
two_fifty.push_back(ii);
386386
std::vector<uint8_t> encoded;
387-
EncodeString16(span<uint16_t>(two_fifty.data(), two_fifty.size()), &encoded);
387+
EncodeString16(two_fifty, &encoded);
388388
EXPECT_EQ(3u + 250u * 2, encoded.size());
389389
// Now check the first three bytes:
390390
// Major type: 2 (BYTE_STRING)
@@ -501,7 +501,7 @@ TEST(EncodeFromLatin1Test, ConvertsToUTF8IfNeeded) {
501501
TEST(EncodeFromUTF16Test, ConvertsToUTF8IfEasy) {
502502
std::vector<uint16_t> ascii = {'e', 'a', 's', 'y'};
503503
std::vector<uint8_t> encoded;
504-
EncodeFromUTF16(span<uint16_t>(ascii.data(), ascii.size()), &encoded);
504+
EncodeFromUTF16(ascii, &encoded);
505505

506506
CBORTokenizer tokenizer(SpanFrom(encoded));
507507
EXPECT_EQ(CBORTokenTag::STRING8, tokenizer.TokenTag());
@@ -518,7 +518,7 @@ TEST(EncodeFromUTF16Test, EncodesAsString16IfNeeded) {
518518
std::vector<uint16_t> msg = {'H', 'e', 'l', 'l', 'o',
519519
',', ' ', 0xd83c, 0xdf0e, '.'};
520520
std::vector<uint8_t> encoded;
521-
EncodeFromUTF16(span<uint16_t>(msg.data(), msg.size()), &encoded);
521+
EncodeFromUTF16(msg, &encoded);
522522

523523
CBORTokenizer tokenizer(SpanFrom(encoded));
524524
EXPECT_EQ(CBORTokenTag::STRING16, tokenizer.TokenTag());
@@ -535,7 +535,7 @@ TEST(EncodeDecodeBinaryTest, RoundtripsHelloWorld) {
535535
std::vector<uint8_t> binary = {'H', 'e', 'l', 'l', 'o', ',', ' ',
536536
'w', 'o', 'r', 'l', 'd', '.'};
537537
std::vector<uint8_t> encoded;
538-
EncodeBinary(span<uint8_t>(binary.data(), binary.size()), &encoded);
538+
EncodeBinary(binary, &encoded);
539539
// So, on the wire we see that the binary blob travels unmodified.
540540
EXPECT_THAT(
541541
encoded,
@@ -699,7 +699,7 @@ TEST(JSONToCBOREncoderTest, SevenBitStrings) {
699699
Status status;
700700
std::unique_ptr<ParserHandler> encoder = NewCBOREncoder(&encoded, &status);
701701
std::vector<uint16_t> utf16 = {'f', 'o', 'o'};
702-
encoder->HandleString16(span<uint16_t>(utf16.data(), utf16.size()));
702+
encoder->HandleString16(utf16);
703703
EXPECT_THAT(status, StatusIsOk());
704704
// Here we assert that indeed, seven bit strings are represented as
705705
// bytes on the wire, "foo" is just "foo".
@@ -771,7 +771,7 @@ TEST(JsonCborRoundtrip, EncodingDecoding) {
771771
std::string decoded;
772772
std::unique_ptr<ParserHandler> json_encoder =
773773
json::NewJSONEncoder(&decoded, &status);
774-
ParseCBOR(span<uint8_t>(encoded.data(), encoded.size()), json_encoder.get());
774+
ParseCBOR(encoded, json_encoder.get());
775775
EXPECT_THAT(status, StatusIsOk());
776776
EXPECT_EQ(json, decoded);
777777
}
@@ -791,7 +791,7 @@ TEST(JsonCborRoundtrip, MoreRoundtripExamples) {
791791
std::string decoded;
792792
std::unique_ptr<ParserHandler> json_writer =
793793
json::NewJSONEncoder(&decoded, &status);
794-
ParseCBOR(span<uint8_t>(encoded.data(), encoded.size()), json_writer.get());
794+
ParseCBOR(encoded, json_writer.get());
795795
EXPECT_THAT(status, StatusIsOk());
796796
EXPECT_EQ(json, decoded);
797797
}
@@ -842,7 +842,7 @@ TEST(ParseCBORTest, ParseEmptyCBORMessage) {
842842
Status status;
843843
std::unique_ptr<ParserHandler> json_writer =
844844
json::NewJSONEncoder(&out, &status);
845-
ParseCBOR(span<uint8_t>(in.data(), in.size()), json_writer.get());
845+
ParseCBOR(in, json_writer.get());
846846
EXPECT_THAT(status, StatusIsOk());
847847
EXPECT_EQ("{}", out);
848848
}
@@ -866,7 +866,7 @@ TEST(ParseCBORTest, ParseCBORHelloWorld) {
866866
Status status;
867867
std::unique_ptr<ParserHandler> json_writer =
868868
json::NewJSONEncoder(&out, &status);
869-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
869+
ParseCBOR(bytes, json_writer.get());
870870
EXPECT_THAT(status, StatusIsOk());
871871
EXPECT_EQ("{\"msg\":\"Hello, \\ud83c\\udf0e.\"}", out);
872872
}
@@ -887,7 +887,7 @@ TEST(ParseCBORTest, UTF8IsSupportedInKeys) {
887887
Status status;
888888
std::unique_ptr<ParserHandler> json_writer =
889889
json::NewJSONEncoder(&out, &status);
890-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
890+
ParseCBOR(bytes, json_writer.get());
891891
EXPECT_THAT(status, StatusIsOk());
892892
EXPECT_EQ("{\"\\ud83c\\udf0e\":\"\\u263e\"}", out);
893893
}
@@ -898,7 +898,7 @@ TEST(ParseCBORTest, NoInputError) {
898898
Status status;
899899
std::unique_ptr<ParserHandler> json_writer =
900900
json::NewJSONEncoder(&out, &status);
901-
ParseCBOR(span<uint8_t>(in.data(), in.size()), json_writer.get());
901+
ParseCBOR(in, json_writer.get());
902902
EXPECT_THAT(status, StatusIs(Error::CBOR_UNEXPECTED_EOF_IN_ENVELOPE, 0u));
903903
EXPECT_EQ("", out);
904904
}
@@ -914,7 +914,7 @@ TEST(ParseCBORTest, UnexpectedEofExpectedValueError) {
914914
Status status;
915915
std::unique_ptr<ParserHandler> json_writer =
916916
json::NewJSONEncoder(&out, &status);
917-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
917+
ParseCBOR(bytes, json_writer.get());
918918
EXPECT_THAT(status, StatusIs(Error::CBOR_UNEXPECTED_EOF_EXPECTED_VALUE,
919919
bytes.size()));
920920
EXPECT_EQ("", out);
@@ -932,7 +932,7 @@ TEST(ParseCBORTest, UnexpectedEofInArrayError) {
932932
Status status;
933933
std::unique_ptr<ParserHandler> json_writer =
934934
json::NewJSONEncoder(&out, &status);
935-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
935+
ParseCBOR(bytes, json_writer.get());
936936
EXPECT_THAT(status,
937937
StatusIs(Error::CBOR_UNEXPECTED_EOF_IN_ARRAY, bytes.size()));
938938
EXPECT_EQ("", out);
@@ -947,7 +947,7 @@ TEST(ParseCBORTest, UnexpectedEofInMapError) {
947947
Status status;
948948
std::unique_ptr<ParserHandler> json_writer =
949949
json::NewJSONEncoder(&out, &status);
950-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
950+
ParseCBOR(bytes, json_writer.get());
951951
EXPECT_THAT(status, StatusIs(Error::CBOR_UNEXPECTED_EOF_IN_MAP, 7u));
952952
EXPECT_EQ("", out);
953953
}
@@ -963,7 +963,7 @@ TEST(ParseCBORTest, EnvelopeEncodingLegacy) {
963963
Status status;
964964
std::unique_ptr<ParserHandler> json_writer =
965965
json::NewJSONEncoder(&out, &status);
966-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
966+
ParseCBOR(bytes, json_writer.get());
967967
EXPECT_THAT(status, StatusIsOk());
968968
EXPECT_EQ(out, "{\"foo\":42}");
969969
}
@@ -980,7 +980,7 @@ TEST(ParseCBORTest, EnvelopeEncodingBySpec) {
980980
Status status;
981981
std::unique_ptr<ParserHandler> json_writer =
982982
json::NewJSONEncoder(&out, &status);
983-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
983+
ParseCBOR(bytes, json_writer.get());
984984
EXPECT_THAT(status, StatusIsOk());
985985
EXPECT_EQ(out, "{\"foo\":42}");
986986
}
@@ -991,7 +991,7 @@ TEST(ParseCBORTest, NoEmptyEnvelopesAllowed) {
991991
Status status;
992992
std::unique_ptr<ParserHandler> json_writer =
993993
json::NewJSONEncoder(&out, &status);
994-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
994+
ParseCBOR(bytes, json_writer.get());
995995
EXPECT_THAT(status, StatusIs(Error::CBOR_MAP_OR_ARRAY_EXPECTED_IN_ENVELOPE,
996996
bytes.size()));
997997
EXPECT_EQ("", out);
@@ -1021,7 +1021,7 @@ TEST(ParseCBORTest, OnlyMapsAndArraysSupportedInsideEnvelopes) {
10211021
Status status;
10221022
std::unique_ptr<ParserHandler> json_writer =
10231023
json::NewJSONEncoder(&out, &status);
1024-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1024+
ParseCBOR(bytes, json_writer.get());
10251025
EXPECT_THAT(status, StatusIs(Error::CBOR_MAP_OR_ARRAY_EXPECTED_IN_ENVELOPE,
10261026
error_pos));
10271027
EXPECT_EQ("", out);
@@ -1038,7 +1038,7 @@ TEST(ParseCBORTest, InvalidMapKeyError) {
10381038
Status status;
10391039
std::unique_ptr<ParserHandler> json_writer =
10401040
json::NewJSONEncoder(&out, &status);
1041-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1041+
ParseCBOR(bytes, json_writer.get());
10421042
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_MAP_KEY, 7u));
10431043
EXPECT_EQ("", out);
10441044
}
@@ -1068,7 +1068,7 @@ TEST(ParseCBORTest, StackLimitExceededError) {
10681068
Status status;
10691069
std::unique_ptr<ParserHandler> json_writer =
10701070
json::NewJSONEncoder(&out, &status);
1071-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1071+
ParseCBOR(bytes, json_writer.get());
10721072
EXPECT_THAT(status, StatusIsOk());
10731073
EXPECT_EQ("{\"key\":{\"key\":{\"key\":\"innermost_value\"}}}", out);
10741074
}
@@ -1078,7 +1078,7 @@ TEST(ParseCBORTest, StackLimitExceededError) {
10781078
Status status;
10791079
std::unique_ptr<ParserHandler> json_writer =
10801080
json::NewJSONEncoder(&out, &status);
1081-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1081+
ParseCBOR(bytes, json_writer.get());
10821082
EXPECT_THAT(status, StatusIsOk());
10831083
}
10841084

@@ -1097,7 +1097,7 @@ TEST(ParseCBORTest, StackLimitExceededError) {
10971097
Status status;
10981098
std::unique_ptr<ParserHandler> json_writer =
10991099
json::NewJSONEncoder(&out, &status);
1100-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1100+
ParseCBOR(bytes, json_writer.get());
11011101
EXPECT_THAT(status, StatusIs(Error::CBOR_STACK_LIMIT_EXCEEDED,
11021102
opening_segment_size * 301));
11031103
}
@@ -1107,7 +1107,7 @@ TEST(ParseCBORTest, StackLimitExceededError) {
11071107
Status status;
11081108
std::unique_ptr<ParserHandler> json_writer =
11091109
json::NewJSONEncoder(&out, &status);
1110-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1110+
ParseCBOR(bytes, json_writer.get());
11111111
EXPECT_THAT(status, StatusIs(Error::CBOR_STACK_LIMIT_EXCEEDED,
11121112
opening_segment_size * 301));
11131113
}
@@ -1126,7 +1126,7 @@ TEST(ParseCBORTest, UnsupportedValueError) {
11261126
Status status;
11271127
std::unique_ptr<ParserHandler> json_writer =
11281128
json::NewJSONEncoder(&out, &status);
1129-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1129+
ParseCBOR(bytes, json_writer.get());
11301130
EXPECT_THAT(status, StatusIs(Error::CBOR_UNSUPPORTED_VALUE, error_pos));
11311131
EXPECT_EQ("", out);
11321132
}
@@ -1148,7 +1148,7 @@ TEST(ParseCBORTest, InvalidString16Error) {
11481148
Status status;
11491149
std::unique_ptr<ParserHandler> json_writer =
11501150
json::NewJSONEncoder(&out, &status);
1151-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1151+
ParseCBOR(bytes, json_writer.get());
11521152
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_STRING16, error_pos));
11531153
EXPECT_EQ("", out);
11541154
}
@@ -1167,7 +1167,7 @@ TEST(ParseCBORTest, InvalidString8Error) {
11671167
Status status;
11681168
std::unique_ptr<ParserHandler> json_writer =
11691169
json::NewJSONEncoder(&out, &status);
1170-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1170+
ParseCBOR(bytes, json_writer.get());
11711171
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_STRING8, error_pos));
11721172
EXPECT_EQ("", out);
11731173
}
@@ -1188,7 +1188,7 @@ TEST(ParseCBORTest, InvalidBinaryError) {
11881188
Status status;
11891189
std::unique_ptr<ParserHandler> json_writer =
11901190
json::NewJSONEncoder(&out, &status);
1191-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1191+
ParseCBOR(bytes, json_writer.get());
11921192
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_BINARY, error_pos));
11931193
EXPECT_EQ("", out);
11941194
}
@@ -1208,7 +1208,7 @@ TEST(ParseCBORTest, InvalidDoubleError) {
12081208
Status status;
12091209
std::unique_ptr<ParserHandler> json_writer =
12101210
json::NewJSONEncoder(&out, &status);
1211-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1211+
ParseCBOR(bytes, json_writer.get());
12121212
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_DOUBLE, error_pos));
12131213
EXPECT_EQ("", out);
12141214
}
@@ -1228,7 +1228,7 @@ TEST(ParseCBORTest, InvalidSignedError) {
12281228
Status status;
12291229
std::unique_ptr<ParserHandler> json_writer =
12301230
json::NewJSONEncoder(&out, &status);
1231-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1231+
ParseCBOR(bytes, json_writer.get());
12321232
EXPECT_THAT(status, StatusIs(Error::CBOR_INVALID_INT32, error_pos));
12331233
EXPECT_EQ("", out);
12341234
}
@@ -1250,7 +1250,7 @@ TEST(ParseCBORTest, TrailingJunk) {
12501250
Status status;
12511251
std::unique_ptr<ParserHandler> json_writer =
12521252
json::NewJSONEncoder(&out, &status);
1253-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1253+
ParseCBOR(bytes, json_writer.get());
12541254
EXPECT_THAT(status, StatusIs(Error::CBOR_TRAILING_JUNK, error_pos));
12551255
EXPECT_EQ("", out);
12561256
}
@@ -1272,7 +1272,7 @@ TEST(ParseCBORTest, EnvelopeContentsLengthMismatch) {
12721272
Status status;
12731273
std::unique_ptr<ParserHandler> json_writer =
12741274
json::NewJSONEncoder(&out, &status);
1275-
ParseCBOR(span<uint8_t>(bytes.data(), bytes.size()), json_writer.get());
1275+
ParseCBOR(bytes, json_writer.get());
12761276
EXPECT_THAT(status, StatusIs(Error::CBOR_ENVELOPE_CONTENTS_LENGTH_MISMATCH,
12771277
bytes.size()));
12781278
EXPECT_EQ("", out);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.