Moves libraries from //third_party/spdy/core/hpack to //third_party/http2/hpack. Protected by refactoring, no functional change; not protected. PiperOrigin-RevId: 679182238
diff --git a/build/source_list.bzl b/build/source_list.bzl index 3e6c483..35ae6e0 100644 --- a/build/source_list.bzl +++ b/build/source_list.bzl
@@ -127,6 +127,7 @@ "http2/hpack/decoder/hpack_whole_entry_buffer.h", "http2/hpack/decoder/hpack_whole_entry_listener.h", "http2/hpack/hpack_constants.h", + "http2/hpack/hpack_decoder_adapter.h", "http2/hpack/hpack_encoder.h", "http2/hpack/hpack_entry.h", "http2/hpack/hpack_header_table.h", @@ -396,7 +397,6 @@ "quic/platform/api/quic_stack_trace.h", "quic/platform/api/quic_testvalue.h", "quic/platform/api/quic_thread.h", - "spdy/core/hpack/hpack_decoder_adapter.h", "spdy/core/hpack/hpack_encoder.h", "spdy/core/spdy_bitmasks.h", "spdy/core/spdy_protocol.h", @@ -480,6 +480,7 @@ "http2/hpack/decoder/hpack_whole_entry_buffer.cc", "http2/hpack/decoder/hpack_whole_entry_listener.cc", "http2/hpack/hpack_constants.cc", + "http2/hpack/hpack_decoder_adapter.cc", "http2/hpack/hpack_encoder.cc", "http2/hpack/hpack_entry.cc", "http2/hpack/hpack_header_table.cc", @@ -697,7 +698,6 @@ "quic/core/web_transport_stats.cc", "quic/core/web_transport_write_blocked_list.cc", "quic/platform/api/quic_socket_address.cc", - "spdy/core/hpack/hpack_decoder_adapter.cc", "web_transport/complete_buffer_visitor.cc", "web_transport/encapsulated/encapsulated_web_transport.cc", "web_transport/web_transport_headers.cc", @@ -1151,10 +1151,12 @@ "http2/hpack/decoder/hpack_entry_type_decoder_test.cc", "http2/hpack/decoder/hpack_string_decoder_test.cc", "http2/hpack/decoder/hpack_whole_entry_buffer_test.cc", + "http2/hpack/hpack_decoder_adapter_test.cc", "http2/hpack/hpack_encoder_test.cc", "http2/hpack/hpack_entry_test.cc", "http2/hpack/hpack_header_table_test.cc", "http2/hpack/hpack_output_stream_test.cc", + "http2/hpack/hpack_round_trip_test.cc", "http2/hpack/hpack_static_table_test.cc", "http2/hpack/http2_hpack_constants_test.cc", "http2/hpack/huffman/hpack_huffman_decoder_test.cc", @@ -1335,8 +1337,6 @@ "quic/tools/quic_memory_cache_backend_test.cc", "quic/tools/quic_tcp_like_trace_converter_test.cc", "quic/tools/simple_ticket_crypter_test.cc", - "spdy/core/hpack/hpack_decoder_adapter_test.cc", - "spdy/core/hpack/hpack_round_trip_test.cc", "web_transport/encapsulated/encapsulated_web_transport_test.cc", "web_transport/web_transport_headers_test.cc", "web_transport/web_transport_priority_scheduler_test.cc",
diff --git a/build/source_list.gni b/build/source_list.gni index b42988e..32e618b 100644 --- a/build/source_list.gni +++ b/build/source_list.gni
@@ -127,6 +127,7 @@ "src/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.h", "src/quiche/http2/hpack/decoder/hpack_whole_entry_listener.h", "src/quiche/http2/hpack/hpack_constants.h", + "src/quiche/http2/hpack/hpack_decoder_adapter.h", "src/quiche/http2/hpack/hpack_encoder.h", "src/quiche/http2/hpack/hpack_entry.h", "src/quiche/http2/hpack/hpack_header_table.h", @@ -396,7 +397,6 @@ "src/quiche/quic/platform/api/quic_stack_trace.h", "src/quiche/quic/platform/api/quic_testvalue.h", "src/quiche/quic/platform/api/quic_thread.h", - "src/quiche/spdy/core/hpack/hpack_decoder_adapter.h", "src/quiche/spdy/core/hpack/hpack_encoder.h", "src/quiche/spdy/core/spdy_bitmasks.h", "src/quiche/spdy/core/spdy_protocol.h", @@ -480,6 +480,7 @@ "src/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc", "src/quiche/http2/hpack/decoder/hpack_whole_entry_listener.cc", "src/quiche/http2/hpack/hpack_constants.cc", + "src/quiche/http2/hpack/hpack_decoder_adapter.cc", "src/quiche/http2/hpack/hpack_encoder.cc", "src/quiche/http2/hpack/hpack_entry.cc", "src/quiche/http2/hpack/hpack_header_table.cc", @@ -697,7 +698,6 @@ "src/quiche/quic/core/web_transport_stats.cc", "src/quiche/quic/core/web_transport_write_blocked_list.cc", "src/quiche/quic/platform/api/quic_socket_address.cc", - "src/quiche/spdy/core/hpack/hpack_decoder_adapter.cc", "src/quiche/web_transport/complete_buffer_visitor.cc", "src/quiche/web_transport/encapsulated/encapsulated_web_transport.cc", "src/quiche/web_transport/web_transport_headers.cc", @@ -1152,10 +1152,12 @@ "src/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc", "src/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc", "src/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc", + "src/quiche/http2/hpack/hpack_decoder_adapter_test.cc", "src/quiche/http2/hpack/hpack_encoder_test.cc", "src/quiche/http2/hpack/hpack_entry_test.cc", "src/quiche/http2/hpack/hpack_header_table_test.cc", "src/quiche/http2/hpack/hpack_output_stream_test.cc", + "src/quiche/http2/hpack/hpack_round_trip_test.cc", "src/quiche/http2/hpack/hpack_static_table_test.cc", "src/quiche/http2/hpack/http2_hpack_constants_test.cc", "src/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc", @@ -1336,8 +1338,6 @@ "src/quiche/quic/tools/quic_memory_cache_backend_test.cc", "src/quiche/quic/tools/quic_tcp_like_trace_converter_test.cc", "src/quiche/quic/tools/simple_ticket_crypter_test.cc", - "src/quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc", - "src/quiche/spdy/core/hpack/hpack_round_trip_test.cc", "src/quiche/web_transport/encapsulated/encapsulated_web_transport_test.cc", "src/quiche/web_transport/web_transport_headers_test.cc", "src/quiche/web_transport/web_transport_priority_scheduler_test.cc",
diff --git a/build/source_list.json b/build/source_list.json index d7de1c5..05c51a5 100644 --- a/build/source_list.json +++ b/build/source_list.json
@@ -126,6 +126,7 @@ "quiche/http2/hpack/decoder/hpack_whole_entry_buffer.h", "quiche/http2/hpack/decoder/hpack_whole_entry_listener.h", "quiche/http2/hpack/hpack_constants.h", + "quiche/http2/hpack/hpack_decoder_adapter.h", "quiche/http2/hpack/hpack_encoder.h", "quiche/http2/hpack/hpack_entry.h", "quiche/http2/hpack/hpack_header_table.h", @@ -395,7 +396,6 @@ "quiche/quic/platform/api/quic_stack_trace.h", "quiche/quic/platform/api/quic_testvalue.h", "quiche/quic/platform/api/quic_thread.h", - "quiche/spdy/core/hpack/hpack_decoder_adapter.h", "quiche/spdy/core/hpack/hpack_encoder.h", "quiche/spdy/core/spdy_bitmasks.h", "quiche/spdy/core/spdy_protocol.h", @@ -479,6 +479,7 @@ "quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc", "quiche/http2/hpack/decoder/hpack_whole_entry_listener.cc", "quiche/http2/hpack/hpack_constants.cc", + "quiche/http2/hpack/hpack_decoder_adapter.cc", "quiche/http2/hpack/hpack_encoder.cc", "quiche/http2/hpack/hpack_entry.cc", "quiche/http2/hpack/hpack_header_table.cc", @@ -696,7 +697,6 @@ "quiche/quic/core/web_transport_stats.cc", "quiche/quic/core/web_transport_write_blocked_list.cc", "quiche/quic/platform/api/quic_socket_address.cc", - "quiche/spdy/core/hpack/hpack_decoder_adapter.cc", "quiche/web_transport/complete_buffer_visitor.cc", "quiche/web_transport/encapsulated/encapsulated_web_transport.cc", "quiche/web_transport/web_transport_headers.cc", @@ -1151,10 +1151,12 @@ "quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc", "quiche/http2/hpack/decoder/hpack_string_decoder_test.cc", "quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc", + "quiche/http2/hpack/hpack_decoder_adapter_test.cc", "quiche/http2/hpack/hpack_encoder_test.cc", "quiche/http2/hpack/hpack_entry_test.cc", "quiche/http2/hpack/hpack_header_table_test.cc", "quiche/http2/hpack/hpack_output_stream_test.cc", + "quiche/http2/hpack/hpack_round_trip_test.cc", "quiche/http2/hpack/hpack_static_table_test.cc", "quiche/http2/hpack/http2_hpack_constants_test.cc", "quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc", @@ -1335,8 +1337,6 @@ "quiche/quic/tools/quic_memory_cache_backend_test.cc", "quiche/quic/tools/quic_tcp_like_trace_converter_test.cc", "quiche/quic/tools/simple_ticket_crypter_test.cc", - "quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc", - "quiche/spdy/core/hpack/hpack_round_trip_test.cc", "quiche/web_transport/encapsulated/encapsulated_web_transport_test.cc", "quiche/web_transport/web_transport_headers_test.cc", "quiche/web_transport/web_transport_priority_scheduler_test.cc"
diff --git a/quiche/http2/core/http2_frame_decoder_adapter.cc b/quiche/http2/core/http2_frame_decoder_adapter.cc index 64362d1..38420ee 100644 --- a/quiche/http2/core/http2_frame_decoder_adapter.cc +++ b/quiche/http2/core/http2_frame_decoder_adapter.cc
@@ -24,13 +24,13 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/decoder/http2_frame_decoder.h" #include "quiche/http2/hpack/decoder/hpack_decoding_error.h" +#include "quiche/http2/hpack/hpack_decoder_adapter.h" #include "quiche/http2/hpack/hpack_header_table.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" #include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/quiche_endian.h" -#include "quiche/spdy/core/hpack/hpack_decoder_adapter.h" using ::spdy::ExtensionVisitorInterface; using ::spdy::HpackDecoderAdapter;
diff --git a/quiche/http2/core/http2_frame_decoder_adapter.h b/quiche/http2/core/http2_frame_decoder_adapter.h index 2fde705..54c041b 100644 --- a/quiche/http2/core/http2_frame_decoder_adapter.h +++ b/quiche/http2/core/http2_frame_decoder_adapter.h
@@ -19,10 +19,10 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/decoder/http2_frame_decoder.h" #include "quiche/http2/decoder/http2_frame_decoder_listener.h" +#include "quiche/http2/hpack/hpack_decoder_adapter.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" #include "quiche/common/platform/api/quiche_export.h" -#include "quiche/spdy/core/hpack/hpack_decoder_adapter.h" namespace spdy {
diff --git a/quiche/spdy/core/hpack/hpack_decoder_adapter.cc b/quiche/http2/hpack/hpack_decoder_adapter.cc similarity index 98% rename from quiche/spdy/core/hpack/hpack_decoder_adapter.cc rename to quiche/http2/hpack/hpack_decoder_adapter.cc index ce3dcbb..d8112e2 100644 --- a/quiche/spdy/core/hpack/hpack_decoder_adapter.cc +++ b/quiche/http2/hpack/hpack_decoder_adapter.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "quiche/spdy/core/hpack/hpack_decoder_adapter.h" +#include "quiche/http2/hpack/hpack_decoder_adapter.h" #include <cstddef> #include <string>
diff --git a/quiche/spdy/core/hpack/hpack_decoder_adapter.h b/quiche/http2/hpack/hpack_decoder_adapter.h similarity index 96% rename from quiche/spdy/core/hpack/hpack_decoder_adapter.h rename to quiche/http2/hpack/hpack_decoder_adapter.h index a675df9..46eb700 100644 --- a/quiche/spdy/core/hpack/hpack_decoder_adapter.h +++ b/quiche/http2/hpack/hpack_decoder_adapter.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef QUICHE_SPDY_CORE_HPACK_HPACK_DECODER_ADAPTER_H_ -#define QUICHE_SPDY_CORE_HPACK_HPACK_DECODER_ADAPTER_H_ +#ifndef QUICHE_HTTP2_HPACK_HPACK_DECODER_ADAPTER_H_ +#define QUICHE_HTTP2_HPACK_HPACK_DECODER_ADAPTER_H_ // HpackDecoderAdapter uses http2::HpackDecoder to decode HPACK blocks into // HTTP/2 header lists as outlined in http://tools.ietf.org/html/rfc7541. @@ -139,4 +139,4 @@ } // namespace spdy -#endif // QUICHE_SPDY_CORE_HPACK_HPACK_DECODER_ADAPTER_H_ +#endif // QUICHE_HTTP2_HPACK_HPACK_DECODER_ADAPTER_H_
diff --git a/quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc b/quiche/http2/hpack/hpack_decoder_adapter_test.cc similarity index 99% rename from quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc rename to quiche/http2/hpack/hpack_decoder_adapter_test.cc index 8ac28ef..82937a6 100644 --- a/quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc +++ b/quiche/http2/hpack/hpack_decoder_adapter_test.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "quiche/spdy/core/hpack/hpack_decoder_adapter.h" +#include "quiche/http2/hpack/hpack_decoder_adapter.h" // Tests of HpackDecoderAdapter.
diff --git a/quiche/spdy/core/hpack/hpack_round_trip_test.cc b/quiche/http2/hpack/hpack_round_trip_test.cc similarity index 98% rename from quiche/spdy/core/hpack/hpack_round_trip_test.cc rename to quiche/http2/hpack/hpack_round_trip_test.cc index 245f953..5ff283d 100644 --- a/quiche/spdy/core/hpack/hpack_round_trip_test.cc +++ b/quiche/http2/hpack/hpack_round_trip_test.cc
@@ -9,11 +9,11 @@ #include <vector> #include "quiche/http2/core/recording_headers_handler.h" +#include "quiche/http2/hpack/hpack_decoder_adapter.h" #include "quiche/http2/hpack/hpack_encoder.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/common/http/http_header_block.h" #include "quiche/common/platform/api/quiche_test.h" -#include "quiche/spdy/core/hpack/hpack_decoder_adapter.h" namespace spdy { namespace test {