[WebSocket] Rename WebSocketFrame member and update comment.
This is a follow-up patch of previous change:
"[WebSocket] Reduce memcpy at websocket_frame_parser.cc"
https://chromium-review.googlesource.com/c/chromium/src/+/1774420
Bug: 1001915
Change-Id: Ib13c28038a82b4b6ca0eb53a3e4d56ac5242720c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792030
Reviewed-by: Yutaka Hirano <[email protected]>
Reviewed-by: John Chen <[email protected]>
Reviewed-by: Adam Rice <[email protected]>
Auto-Submit: Yoichi Osato <[email protected]>
Commit-Queue: John Chen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#694826}
diff --git a/chrome/test/chromedriver/net/websocket.cc b/chrome/test/chromedriver/net/websocket.cc
index c705781..fb8cc3f 100644
--- a/chrome/test/chromedriver/net/websocket.cc
+++ b/chrome/test/chromedriver/net/websocket.cc
@@ -286,7 +286,7 @@
current_masking_key_ = header->masking_key;
}
- auto& buffer = frame_chunks[i]->data;
+ auto& buffer = frame_chunks[i]->payload;
std::vector<char> payload(buffer.begin(), buffer.end());
if (is_current_frame_masked_) {
MaskWebSocketFramePayload(current_masking_key_, current_frame_offset_,
diff --git a/net/websockets/websocket_basic_stream.cc b/net/websockets/websocket_basic_stream.cc
index a2c189bc..0dc01150 100644
--- a/net/websockets/websocket_basic_stream.cc
+++ b/net/websockets/websocket_basic_stream.cc
@@ -180,7 +180,7 @@
static_cast<uint64_t>(remaining_size));
const int frame_size = static_cast<int>(frame->header.payload_length);
if (frame_size > 0) {
- const char* const frame_data = frame->data;
+ const char* const frame_data = frame->payload;
std::copy(frame_data, frame_data + frame_size, dest);
MaskWebSocketFramePayload(mask, 0, dest, frame_size);
dest += frame_size;
@@ -360,7 +360,7 @@
}
DCHECK(current_frame_header_) << "Unexpected header-less chunk received "
<< "(final_chunk = " << chunk->final_chunk
- << ", data size = " << chunk->data.size()
+ << ", payload size = " << chunk->payload.size()
<< ") (bug in WebSocketFrameParser?)";
const bool is_final_chunk = chunk->final_chunk;
const WebSocketFrameHeader::OpCode opcode = current_frame_header_->opcode;
@@ -384,13 +384,13 @@
if (!is_final_chunk) {
DVLOG(2) << "Encountered a split control frame, opcode " << opcode;
- AddToIncompleteControlFrameBody(chunk->data);
+ AddToIncompleteControlFrameBody(chunk->payload);
return OK;
}
if (!incomplete_control_frame_body_.empty()) {
DVLOG(2) << "Rejoining a split control frame, opcode " << opcode;
- AddToIncompleteControlFrameBody(chunk->data);
+ AddToIncompleteControlFrameBody(chunk->payload);
DCHECK(is_final_chunk);
DCHECK(complete_control_frame_body_.empty());
complete_control_frame_body_ = std::move(incomplete_control_frame_body_);
@@ -403,13 +403,13 @@
// header. A check for exact equality can only be used when the whole frame
// arrives in one chunk.
DCHECK_GE(current_frame_header_->payload_length,
- base::checked_cast<uint64_t>(chunk->data.size()));
+ base::checked_cast<uint64_t>(chunk->payload.size()));
DCHECK(!is_first_chunk || !is_final_chunk ||
current_frame_header_->payload_length ==
- base::checked_cast<uint64_t>(chunk->data.size()));
+ base::checked_cast<uint64_t>(chunk->payload.size()));
// Convert the chunk to a complete frame.
- *frame = CreateFrame(is_final_chunk, chunk->data);
+ *frame = CreateFrame(is_final_chunk, chunk->payload);
return OK;
}
@@ -429,7 +429,7 @@
result_frame->header.CopyFrom(*current_frame_header_);
result_frame->header.final = is_final_chunk_in_message;
result_frame->header.payload_length = data.size();
- result_frame->data = data.data();
+ result_frame->payload = data.data();
// Ensure that opcodes Text and Binary are only used for the first frame in
// the message. Also clear the reserved bits.
// TODO(ricea): If a future extension requires the reserved bits to be
diff --git a/net/websockets/websocket_basic_stream.h b/net/websockets/websocket_basic_stream.h
index ee07d79..c6cdf14 100644
--- a/net/websockets/websocket_basic_stream.h
+++ b/net/websockets/websocket_basic_stream.h
@@ -146,9 +146,7 @@
// bounds checks.
void AddToIncompleteControlFrameBody(base::span<const char> data);
- // Storage for pending reads. All active WebSockets spend all the time with a
- // call to ReadFrames() pending, so there is no benefit in trying to share
- // this between sockets.
+ // Storage for pending reads.
scoped_refptr<IOBufferWithSize> read_buffer_;
// The connection, wrapped in a ClientSocketHandle so that we can prevent it
@@ -164,7 +162,7 @@
// Although it should rarely happen in practice, a control frame can arrive
// broken into chunks. This variable provides storage for a partial control
- // frame until the rest arrives. It will be NULL the rest of the time.
+ // frame until the rest arrives. It will be empty the rest of the time.
std::vector<char> incomplete_control_frame_body_;
// Storage for payload of combined (see |incomplete_control_frame_body_|)
// control frame.
diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc
index 301b5a2..95c2c44f 100644
--- a/net/websockets/websocket_basic_stream_test.cc
+++ b/net/websockets/websocket_basic_stream_test.cc
@@ -257,7 +257,7 @@
frame_buffers_.push_back(buffer);
memcpy(buffer->data(), kWriteFrame + kWriteFrameSize - payload_size,
payload_size);
- frame->data = buffer->data();
+ frame->payload = buffer->data();
WebSocketFrameHeader& header = frame->header;
header.final = true;
header.masked = true;
@@ -356,7 +356,7 @@
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()), IsOk());
ASSERT_EQ(1U, frames_.size());
- EXPECT_EQ(nullptr, frames_[0]->data);
+ EXPECT_EQ(nullptr, frames_[0]->payload);
EXPECT_EQ(0U, frames_[0]->header.payload_length);
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_[0]->header.opcode);
}
@@ -372,7 +372,7 @@
CreateStream(reads, base::span<MockWrite>());
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()), IsOk());
ASSERT_EQ(1U, frames_.size());
- EXPECT_EQ(nullptr, frames_[0]->data);
+ EXPECT_EQ(nullptr, frames_[0]->payload);
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_[0]->header.opcode);
frames_.clear();
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()),
@@ -580,7 +580,7 @@
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()), IsOk());
ASSERT_EQ(1U, frames_.size());
- EXPECT_EQ(nullptr, frames_[0]->data);
+ EXPECT_EQ(nullptr, frames_[0]->payload);
EXPECT_EQ(0U, frames_[0]->header.payload_length);
}
@@ -627,7 +627,7 @@
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()), IsOk());
ASSERT_EQ(1U, frames_.size());
- EXPECT_EQ(nullptr, frames_[0]->data);
+ EXPECT_EQ(nullptr, frames_[0]->payload);
EXPECT_EQ(0U, frames_[0]->header.payload_length);
}
@@ -658,7 +658,7 @@
EXPECT_THAT(stream_->ReadFrames(&frames_, cb_.callback()), IsOk());
ASSERT_EQ(1U, frames_.size());
- ASSERT_TRUE(frames_[0]->data);
+ ASSERT_TRUE(frames_[0]->payload);
EXPECT_EQ(UINT64_C(6), frames_[0]->header.payload_length);
}
@@ -673,7 +673,7 @@
IsError(ERR_IO_PENDING));
EXPECT_THAT(cb_.WaitForResult(), IsOk());
ASSERT_EQ(1U, frames_.size());
- ASSERT_TRUE(frames_[0]->data);
+ ASSERT_TRUE(frames_[0]->payload);
EXPECT_EQ(UINT64_C(6), frames_[0]->header.payload_length);
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_[0]->header.opcode);
}
@@ -694,7 +694,7 @@
ASSERT_EQ(1U, frames_.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeClose, frames_[0]->header.opcode);
EXPECT_EQ(kCloseFrameSize - 2, frames_[0]->header.payload_length);
- EXPECT_EQ(std::string(frames_[0]->data, kCloseFrameSize - 2),
+ EXPECT_EQ(std::string(frames_[0]->payload, kCloseFrameSize - 2),
std::string(kCloseFrame + 2, kCloseFrameSize - 2));
}
@@ -946,7 +946,7 @@
const size_t payload_size = unmasked_payload.size();
auto buffer = base::MakeRefCounted<IOBuffer>(payload_size);
memcpy(buffer->data(), unmasked_payload.data(), payload_size);
- frame->data = buffer->data();
+ frame->payload = buffer->data();
WebSocketFrameHeader& header = frame->header;
header.final = true;
header.masked = true;
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index 3196986a..3fb8aa1 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -703,7 +703,7 @@
// Respond to the frame appropriately to its type.
return HandleFrameByState(
opcode, frame->header.final,
- base::make_span(frame->data, frame->header.payload_length));
+ base::make_span(frame->payload, frame->header.payload_length));
}
ChannelState WebSocketChannel::HandleFrameByState(
@@ -902,7 +902,7 @@
header.final = fin;
header.masked = true;
header.payload_length = buffer_size;
- frame->data = buffer->data();
+ frame->payload = buffer->data();
if (data_being_sent_) {
// Either the link to the WebSocket server is saturated, or several messages
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index 3551eb5..e3d00767 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -72,9 +72,9 @@
std::ostream& operator<<(std::ostream& os, const WebSocketFrame& frame) {
os << "{" << frame.header << ", ";
- if (frame.data) {
+ if (frame.payload) {
return os << "\""
- << base::StringPiece(frame.data, frame.header.payload_length)
+ << base::StringPiece(frame.payload, frame.header.payload_length)
<< "\"}";
}
return os << "NULL}";
@@ -362,7 +362,7 @@
auto buffer = base::MakeRefCounted<IOBuffer>(frame_length);
result_frame_data->push_back(buffer);
memcpy(buffer->data(), source_frame.data, frame_length);
- result_frame->data = buffer->data();
+ result_frame->payload = buffer->data();
}
result_frames.push_back(std::move(result_frame));
}
@@ -424,7 +424,7 @@
return false;
}
if (expected_length != 0 &&
- memcmp(actual_frame.data, expected_frame.data,
+ memcmp(actual_frame.payload, expected_frame.data,
actual_frame.header.payload_length) != 0) {
*listener << "the data content differs";
return false;
@@ -595,8 +595,8 @@
for (const auto& frame : *frames) {
auto buffer = base::MakeRefCounted<IOBuffer>(
static_cast<size_t>(frame->header.payload_length));
- memcpy(buffer->data(), frame->data, frame->header.payload_length);
- frame->data = buffer->data();
+ memcpy(buffer->data(), frame->payload, frame->header.payload_length);
+ frame->payload = buffer->data();
buffers_.push_back(buffer);
}
stored_frames_.insert(stored_frames_.end(),
@@ -2349,8 +2349,8 @@
ASSERT_EQ(1U, frames->size());
const WebSocketFrame* out_frame = (*frames)[0].get();
EXPECT_EQ(kBinaryBlobSize, out_frame->header.payload_length);
- ASSERT_TRUE(out_frame->data);
- EXPECT_EQ(0, memcmp(kBinaryBlob, out_frame->data, kBinaryBlobSize));
+ ASSERT_TRUE(out_frame->payload);
+ EXPECT_EQ(0, memcmp(kBinaryBlob, out_frame->payload, kBinaryBlobSize));
}
// Test the read path for 8-bit cleanliness as well.
@@ -2362,7 +2362,7 @@
frame_header.payload_length = kBinaryBlobSize;
auto buffer = base::MakeRefCounted<IOBuffer>(kBinaryBlobSize);
memcpy(buffer->data(), kBinaryBlob, kBinaryBlobSize);
- frame->data = buffer->data();
+ frame->payload = buffer->data();
std::vector<std::unique_ptr<WebSocketFrame>> frames;
frames.push_back(std::move(frame));
auto stream = std::make_unique<ReadableFakeWebSocketStream>();
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc
index b03af24..9863396 100644
--- a/net/websockets/websocket_deflate_stream.cc
+++ b/net/websockets/websocket_deflate_stream.cc
@@ -137,9 +137,10 @@
frames_to_write.push_back(std::move(frame));
current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation;
} else {
- if (frame->data &&
+ if (frame->payload &&
!deflater_.AddBytes(
- frame->data, static_cast<size_t>(frame->header.payload_length))) {
+ frame->payload,
+ static_cast<size_t>(frame->header.payload_length))) {
DVLOG(1) << "WebSocket protocol error. "
<< "deflater_.AddBytes() returns an error.";
return ERR_WS_PROTOCOL_ERROR;
@@ -221,7 +222,7 @@
compressed->header.final = header.final;
compressed->header.reserved1 =
(opcode != WebSocketFrameHeader::kOpCodeContinuation);
- compressed->data = compressed_payload->data();
+ compressed->payload = compressed_payload->data();
compressed->header.payload_length = compressed_payload->size();
current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation;
@@ -272,7 +273,7 @@
compressed->header.opcode = opcode;
compressed->header.final = true;
compressed->header.reserved1 = true;
- compressed->data = compressed_payload->data();
+ compressed->payload = compressed_payload->data();
compressed->header.payload_length = compressed_payload->size();
predictor_->RecordWrittenDataFrame(compressed.get());
@@ -319,9 +320,10 @@
frames_to_output.push_back(std::move(frame));
} else {
DCHECK_EQ(reading_state_, READING_COMPRESSED_MESSAGE);
- if (frame->data &&
+ if (frame->payload &&
!inflater_.AddBytes(
- frame->data, static_cast<size_t>(frame->header.payload_length))) {
+ frame->payload,
+ static_cast<size_t>(frame->header.payload_length))) {
DVLOG(1) << "WebSocket protocol error. "
<< "inflater_.AddBytes() returns an error.";
return ERR_WS_PROTOCOL_ERROR;
@@ -354,7 +356,7 @@
inflated->header.opcode = current_reading_opcode_;
inflated->header.final = is_final;
inflated->header.reserved1 = false;
- inflated->data = data->data();
+ inflated->payload = data->data();
inflated->header.payload_length = data->size();
DVLOG(3) << "Inflated frame: opcode=" << inflated->header.opcode
<< " final=" << inflated->header.final
diff --git a/net/websockets/websocket_deflate_stream_fuzzer.cc b/net/websockets/websocket_deflate_stream_fuzzer.cc
index 05065f7..3734128 100644
--- a/net/websockets/websocket_deflate_stream_fuzzer.cc
+++ b/net/websockets/websocket_deflate_stream_fuzzer.cc
@@ -88,7 +88,7 @@
auto buffer = base::MakeRefCounted<IOBufferWithSize>(payload.size());
memcpy(buffer->data(), payload.data(), payload.size());
buffers_.push_back(buffer);
- frame->data = buffer->data();
+ frame->payload = buffer->data();
frame->header.payload_length = payload.size();
return frame;
}
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index 3d16e4c..078a96cf 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -63,8 +63,9 @@
}
std::string ToString(const WebSocketFrame* frame) {
- return frame->data ? std::string(frame->data, frame->header.payload_length)
- : "";
+ return frame->payload
+ ? std::string(frame->payload, frame->header.payload_length)
+ : "";
}
std::string ToString(const std::unique_ptr<WebSocketFrame>& frame) {
@@ -249,7 +250,7 @@
frame->header.reserved1 = (flag & kReserved1);
auto buffer = std::make_unique<char[]>(data.size());
memcpy(buffer.get(), data.c_str(), data.size());
- frame->data = buffer.get();
+ frame->payload = buffer.get();
data_buffers.push_back(std::move(buffer));
frame->header.payload_length = data.size();
frames->push_back(std::move(frame));
@@ -1202,8 +1203,9 @@
ASSERT_THAT(deflate_stream_->WriteFrames(&frames, CompletionOnceCallback()),
IsOk());
for (auto& frame : *stub.frames()) {
- buffers.push_back(std::string(frame->data, frame->header.payload_length));
- frame->data = (buffers.end() - 1)->data();
+ buffers.push_back(
+ std::string(frame->payload, frame->header.payload_length));
+ frame->payload = (buffers.end() - 1)->data();
}
total_compressed_frames.insert(
total_compressed_frames.end(),
diff --git a/net/websockets/websocket_frame.h b/net/websockets/websocket_frame.h
index b7f2ce62..fe935601 100644
--- a/net/websockets/websocket_frame.h
+++ b/net/websockets/websocket_frame.h
@@ -99,10 +99,14 @@
// |header| is always present.
WebSocketFrameHeader header;
- // |data| is always unmasked even if the frame is masked. The size of |data|
- // is given by |header.payload_length|.
- // TODO(yoichio): Rename this to "payload".
- const char* data = nullptr;
+ // |payload| is always unmasked even if the frame is masked. The size of
+ // |payload| is given by |header.payload_length|.
+ // The lifetime of |payload| is not defined by WebSocketFrameChunk. It is the
+ // responsibility of the creator to ensure it remains valid for the lifetime
+ // of this object. This should be documented in the code that creates this
+ // object.
+ // TODO(yoicho): Find more better way to clarify the life cycle.
+ const char* payload = nullptr;
private:
DISALLOW_COPY_AND_ASSIGN(WebSocketFrame);
@@ -136,10 +140,14 @@
// Indicates this part is the last chunk of a frame.
bool final_chunk;
- // |data| is always unmasked even if the frame is masked. |data| might be
- // empty in the first chunk.
- // TODO(yoichio): Rename this to "payload".
- base::span<const char> data;
+ // |payload| is always unmasked even if the frame is masked. |payload| might
+ // be empty in the first chunk.
+ // The lifetime of |payload| is not defined by WebSocketFrameChunk. It is the
+ // responsibility of the creator to ensure it remains valid for the lifetime
+ // of this object. This should be documented in the code that creates this
+ // object.
+ // TODO(yoicho): Find more better way to clarify the life cycle.
+ base::span<const char> payload;
private:
DISALLOW_COPY_AND_ASSIGN(WebSocketFrameChunk);
diff --git a/net/websockets/websocket_frame_parser.cc b/net/websockets/websocket_frame_parser.cc
index 5166125..bbbd0db 100644
--- a/net/websockets/websocket_frame_parser.cc
+++ b/net/websockets/websocket_frame_parser.cc
@@ -191,7 +191,7 @@
}
frame_chunk->final_chunk = false;
if (chunk_data_size > 0) {
- frame_chunk->data = data->subspan(0, chunk_data_size);
+ frame_chunk->payload = data->subspan(0, chunk_data_size);
*data = data->subspan(chunk_data_size);
frame_offset_ += chunk_data_size;
}
diff --git a/net/websockets/websocket_frame_parser_test.cc b/net/websockets/websocket_frame_parser_test.cc
index 3730c57..2ae986b3 100644
--- a/net/websockets/websocket_frame_parser_test.cc
+++ b/net/websockets/websocket_frame_parser_test.cc
@@ -70,8 +70,8 @@
}
EXPECT_TRUE(frame->final_chunk);
- ASSERT_EQ(static_cast<size_t>(kHelloLength), frame->data.size());
- EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data.data()));
+ ASSERT_EQ(static_cast<size_t>(kHelloLength), frame->payload.size());
+ EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->payload.data()));
}
TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
@@ -97,9 +97,9 @@
}
EXPECT_TRUE(frame->final_chunk);
- ASSERT_EQ(static_cast<size_t>(kHelloLength), frame->data.size());
+ ASSERT_EQ(static_cast<size_t>(kHelloLength), frame->payload.size());
- std::string payload(frame->data.data(), frame->data.size());
+ std::string payload(frame->payload.data(), frame->payload.size());
MaskWebSocketFramePayload(header->masking_key, 0, &payload[0],
payload.size());
EXPECT_EQ(payload, kHello);
@@ -152,11 +152,11 @@
continue;
EXPECT_TRUE(frame->final_chunk);
ASSERT_EQ(kInputs[i].expected_payload_length,
- static_cast<uint64_t>(frame->data.size()));
+ static_cast<uint64_t>(frame->payload.size()));
EXPECT_TRUE(std::equal(
kInputs[i].expected_payload,
kInputs[i].expected_payload + kInputs[i].expected_payload_length,
- frame->data.data()));
+ frame->payload.data()));
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != nullptr);
@@ -198,11 +198,11 @@
continue;
EXPECT_FALSE(frame1->final_chunk);
if (expected1.size() == 0) {
- EXPECT_EQ(nullptr, frame1->data.data());
+ EXPECT_EQ(nullptr, frame1->payload.data());
} else {
- ASSERT_EQ(cutting_pos, static_cast<size_t>(frame1->data.size()));
- EXPECT_TRUE(
- std::equal(expected1.begin(), expected1.end(), frame1->data.data()));
+ ASSERT_EQ(cutting_pos, static_cast<size_t>(frame1->payload.size()));
+ EXPECT_TRUE(std::equal(expected1.begin(), expected1.end(),
+ frame1->payload.data()));
}
const WebSocketFrameHeader* header1 = frame1->header.get();
EXPECT_TRUE(header1 != nullptr);
@@ -228,11 +228,12 @@
continue;
EXPECT_TRUE(frame2->final_chunk);
if (expected2.size() == 0) {
- EXPECT_EQ(nullptr, frame2->data.data());
+ EXPECT_EQ(nullptr, frame1->payload.data());
} else {
- ASSERT_EQ(expected2.size(), static_cast<uint64_t>(frame2->data.size()));
- EXPECT_TRUE(
- std::equal(expected2.begin(), expected2.end(), frame2->data.data()));
+ ASSERT_EQ(expected2.size(),
+ static_cast<uint64_t>(frame2->payload.size()));
+ EXPECT_TRUE(std::equal(expected2.begin(), expected2.end(),
+ frame2->payload.data()));
}
const WebSocketFrameHeader* header2 = frame2->header.get();
EXPECT_TRUE(header2 == nullptr);
@@ -269,11 +270,13 @@
if (!header1)
continue;
if (expected1.size() == 0) {
- EXPECT_EQ(nullptr, frame1->data.data());
+ EXPECT_EQ(nullptr, frame1->payload.data());
} else {
- ASSERT_EQ(expected1.size(), static_cast<uint64_t>(frame1->data.size()));
- std::vector<char> payload1(frame1->data.data(),
- frame1->data.data() + frame1->data.size());
+ ASSERT_EQ(expected1.size(),
+ static_cast<uint64_t>(frame1->payload.size()));
+ std::vector<char> payload1(
+ frame1->payload.data(),
+ frame1->payload.data() + frame1->payload.size());
MaskWebSocketFramePayload(header1->masking_key, 0, &payload1[0],
payload1.size());
EXPECT_EQ(expected1, payload1);
@@ -298,11 +301,13 @@
continue;
EXPECT_TRUE(frame2->final_chunk);
if (expected2.size() == 0) {
- EXPECT_EQ(nullptr, frame2->data.data());
+ EXPECT_EQ(nullptr, frame2->payload.data());
} else {
- ASSERT_EQ(expected2.size(), static_cast<uint64_t>(frame2->data.size()));
- std::vector<char> payload2(frame2->data.data(),
- frame2->data.data() + frame2->data.size());
+ ASSERT_EQ(expected2.size(),
+ static_cast<uint64_t>(frame2->payload.size()));
+ std::vector<char> payload2(
+ frame2->payload.data(),
+ frame2->payload.data() + frame2->payload.size());
MaskWebSocketFramePayload(header1->masking_key, cutting_pos, &payload2[0],
payload2.size());
EXPECT_EQ(expected2, payload2);
@@ -348,12 +353,12 @@
}
std::vector<char> expected_payload(input_payload_size, 'a');
if (expected_payload.size() == 0) {
- EXPECT_EQ(nullptr, frame->data.data());
+ EXPECT_EQ(nullptr, frame->payload.data());
} else {
ASSERT_EQ(expected_payload.size(),
- static_cast<uint64_t>(frame->data.size()));
+ static_cast<uint64_t>(frame->payload.size()));
EXPECT_TRUE(std::equal(expected_payload.begin(), expected_payload.end(),
- frame->data.data()));
+ frame->payload.data()));
}
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != nullptr);
@@ -409,7 +414,7 @@
} else {
EXPECT_FALSE(frame->final_chunk);
}
- EXPECT_EQ(nullptr, frame->data.data());
+ EXPECT_EQ(nullptr, frame->payload.data());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != nullptr);
if (!header)
@@ -507,7 +512,7 @@
if (!frame)
continue;
EXPECT_TRUE(frame->final_chunk);
- EXPECT_EQ(nullptr, frame->data.data());
+ EXPECT_EQ(nullptr, frame->payload.data());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != nullptr);
if (!header)
@@ -563,7 +568,7 @@
if (!frame)
continue;
EXPECT_TRUE(frame->final_chunk);
- EXPECT_EQ(nullptr, frame->data.data());
+ EXPECT_EQ(nullptr, frame->payload.data());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != nullptr);
if (!header)
diff --git a/net/websockets/websocket_stream_test.cc b/net/websockets/websocket_stream_test.cc
index 9cc49bca..90e53f50 100644
--- a/net/websockets/websocket_stream_test.cc
+++ b/net/websockets/websocket_stream_test.cc
@@ -838,7 +838,7 @@
ASSERT_EQ(1U, frames.size());
ASSERT_EQ(5U, frames[0]->header.payload_length);
EXPECT_EQ(std::string("Hello"),
- std::string(frames[0]->data, frames[0]->header.payload_length));
+ std::string(frames[0]->payload, frames[0]->header.payload_length));
}
// Unknown extension in the response is rejected
