Minor cleanup to HPACK code: removes a parameter that is always nullptr outside of tests.
PiperOrigin-RevId: 391538804
diff --git a/spdy/core/hpack/hpack_decoder_adapter.cc b/spdy/core/hpack/hpack_decoder_adapter.cc
index 03db87d..64a21d8 100644
--- a/spdy/core/hpack/hpack_decoder_adapter.cc
+++ b/spdy/core/hpack/hpack_decoder_adapter.cc
@@ -85,12 +85,8 @@
return true;
}
-bool HpackDecoderAdapter::HandleControlFrameHeadersComplete(
- size_t* compressed_len) {
+bool HpackDecoderAdapter::HandleControlFrameHeadersComplete() {
QUICHE_DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersComplete";
- if (compressed_len != nullptr) {
- *compressed_len = listener_adapter_.total_hpack_bytes();
- }
if (!hpack_decoder_.EndDecodingBlock()) {
QUICHE_DVLOG(3) << "EndDecodingBlock returned false";
error_ = hpack_decoder_.error();
diff --git a/spdy/core/hpack/hpack_decoder_adapter.h b/spdy/core/hpack/hpack_decoder_adapter.h
index 43a762b..a4fc56a 100644
--- a/spdy/core/hpack/hpack_decoder_adapter.h
+++ b/spdy/core/hpack/hpack_decoder_adapter.h
@@ -56,10 +56,7 @@
// buffered block that was accumulated in HandleControlFrameHeadersData(),
// to support subsequent calculation of compression percentage.
// Discards the handler supplied at the start of decoding the block.
- // TODO(jamessynge): Determine if compressed_len is needed; it is used to
- // produce UUMA stat Net.SpdyHpackDecompressionPercentage, but only for
- // deprecated SPDY3.
- bool HandleControlFrameHeadersComplete(size_t* compressed_len);
+ bool HandleControlFrameHeadersComplete();
// Accessor for the most recently decoded headers block. Valid until the next
// call to HandleControlFrameHeadersData().
diff --git a/spdy/core/hpack/hpack_decoder_adapter_test.cc b/spdy/core/hpack/hpack_decoder_adapter_test.cc
index bab6c48..054e3e4 100644
--- a/spdy/core/hpack/hpack_decoder_adapter_test.cc
+++ b/spdy/core/hpack/hpack_decoder_adapter_test.cc
@@ -141,11 +141,8 @@
return decoder_.HandleControlFrameHeadersData(str.data(), str.size());
}
- bool HandleControlFrameHeadersComplete(size_t* size) {
- bool rc = decoder_.HandleControlFrameHeadersComplete(size);
- if (size != nullptr) {
- EXPECT_EQ(*size, bytes_passed_in_);
- }
+ bool HandleControlFrameHeadersComplete() {
+ bool rc = decoder_.HandleControlFrameHeadersComplete();
return rc;
}
@@ -172,22 +169,18 @@
decode_has_failed_ = true;
return false;
}
- // Want to get out the number of compressed bytes that were decoded,
- // so pass in a pointer if no handler.
- size_t total_hpack_bytes = 0;
if (start_choice_ == START_WITH_HANDLER) {
- if (!HandleControlFrameHeadersComplete(nullptr)) {
+ if (!HandleControlFrameHeadersComplete()) {
decode_has_failed_ = true;
return false;
}
- total_hpack_bytes = handler_.compressed_header_bytes();
+ EXPECT_EQ(handler_.compressed_header_bytes(), bytes_passed_in_);
} else {
- if (!HandleControlFrameHeadersComplete(&total_hpack_bytes)) {
+ if (!HandleControlFrameHeadersComplete()) {
decode_has_failed_ = true;
return false;
}
}
- EXPECT_EQ(total_hpack_bytes, bytes_passed_in_);
if (check_decoded_size && start_choice_ == START_WITH_HANDLER) {
EXPECT_EQ(handler_.uncompressed_header_bytes(),
SizeOfHeaders(decoded_block()));
@@ -352,8 +345,7 @@
// entire block successfully.
HandleControlFrameHeadersStart();
EXPECT_TRUE(HandleControlFrameHeadersData(hbb.buffer()));
- size_t total_bytes;
- EXPECT_TRUE(HandleControlFrameHeadersComplete(&total_bytes));
+ EXPECT_TRUE(HandleControlFrameHeadersComplete());
// When a total byte limit is imposed, the decoder bails before the end of the
// block.
@@ -387,9 +379,7 @@
// Add the needed data.
EXPECT_TRUE(HandleControlFrameHeadersData("\x04gggs"));
- size_t size = 0;
- EXPECT_TRUE(HandleControlFrameHeadersComplete(&size));
- EXPECT_EQ(24u, size);
+ EXPECT_TRUE(HandleControlFrameHeadersComplete());
expected_headers.push_back({"spam", "gggs"});
@@ -429,7 +419,7 @@
decoder_peer_.HandleHeaderRepresentation("cookie", " fin!");
// Finish and emit all headers.
- decoder_.HandleControlFrameHeadersComplete(nullptr);
+ decoder_.HandleControlFrameHeadersComplete();
// Resulting decoded headers are in the same order as the inputs.
EXPECT_THAT(
diff --git a/spdy/core/hpack/hpack_round_trip_test.cc b/spdy/core/hpack/hpack_round_trip_test.cc
index 047ae72..3f92e0d 100644
--- a/spdy/core/hpack/hpack_round_trip_test.cc
+++ b/spdy/core/hpack/hpack_round_trip_test.cc
@@ -58,7 +58,7 @@
}
if (success) {
- success = decoder_.HandleControlFrameHeadersComplete(nullptr);
+ success = decoder_.HandleControlFrameHeadersComplete();
}
EXPECT_EQ(header_set, decoder_.decoded_block());
diff --git a/spdy/core/http2_frame_decoder_adapter.cc b/spdy/core/http2_frame_decoder_adapter.cc
index e2e311d..0691f6b 100644
--- a/spdy/core/http2_frame_decoder_adapter.cc
+++ b/spdy/core/http2_frame_decoder_adapter.cc
@@ -1104,7 +1104,7 @@
<< frame_header();
has_expected_frame_type_ = false;
auto* decoder = GetHpackDecoder();
- if (decoder->HandleControlFrameHeadersComplete(nullptr)) {
+ if (decoder->HandleControlFrameHeadersComplete()) {
visitor()->OnHeaderFrameEnd(stream_id());
} else {
SetSpdyErrorAndNotify(
