Replace QUIC_FALLTHROUGH_INTENDED with ABSL_FALLTHROUGH_INTENDED. PiperOrigin-RevId: 338740248 Change-Id: I13feb929bd0c54737b88b8320eb42c771bf38436
diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc index d43b680..ac953ba 100644 --- a/quic/core/congestion_control/bbr_sender.cc +++ b/quic/core/congestion_control/bbr_sender.cc
@@ -8,12 +8,12 @@ #include <sstream> #include <string> +#include "absl/base/attributes.h" #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/core/quic_time_accumulator.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" @@ -734,7 +734,7 @@ if (is_round_start) { recovery_state_ = GROWTH; } - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case GROWTH: // Exit recovery if appropriate.
diff --git a/quic/core/congestion_control/send_algorithm_interface.cc b/quic/core/congestion_control/send_algorithm_interface.cc index 9d003c5..4b36e4a 100644 --- a/quic/core/congestion_control/send_algorithm_interface.cc +++ b/quic/core/congestion_control/send_algorithm_interface.cc
@@ -4,12 +4,12 @@ #include "net/third_party/quiche/src/quic/core/congestion_control/send_algorithm_interface.h" +#include "absl/base/attributes.h" #include "net/third_party/quiche/src/quic/core/congestion_control/bbr2_sender.h" #include "net/third_party/quiche/src/quic/core/congestion_control/bbr_sender.h" #include "net/third_party/quiche/src/quic/core/congestion_control/tcp_cubic_sender_bytes.h" #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_pcc_sender.h" @@ -46,7 +46,7 @@ : nullptr); case kPCC: // PCC is work has stalled, fall back to CUBIC instead. - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case kCubicBytes: return new TcpCubicSenderBytes( clock, rtt_stats, false /* don't use Reno */,
diff --git a/quic/core/crypto/crypto_framer.cc b/quic/core/crypto/crypto_framer.cc index a1a66c1..2a3f795 100644 --- a/quic/core/crypto/crypto_framer.cc +++ b/quic/core/crypto/crypto_framer.cc
@@ -7,12 +7,12 @@ #include <string> #include <utility> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" #include "net/third_party/quiche/src/quic/core/quic_packets.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/common/quiche_endian.h" @@ -258,7 +258,7 @@ reader.ReadTag(&message_tag); message_.set_tag(message_tag); state_ = STATE_READING_NUM_ENTRIES; - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case STATE_READING_NUM_ENTRIES: if (reader.BytesRemaining() < kNumEntriesSize + sizeof(uint16_t)) { break; @@ -274,7 +274,7 @@ tags_and_lengths_.reserve(num_entries_); state_ = STATE_READING_TAGS_AND_LENGTHS; values_len_ = 0; - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case STATE_READING_TAGS_AND_LENGTHS: { if (reader.BytesRemaining() < num_entries_ * (kQuicTagSize + kCryptoEndOffsetSize)) { @@ -308,7 +308,7 @@ } values_len_ = last_end_offset; state_ = STATE_READING_VALUES; - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; } case STATE_READING_VALUES: if (reader.BytesRemaining() < values_len_) {
diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc index e463d24..42379ad 100644 --- a/quic/core/crypto/quic_crypto_server_config.cc +++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -10,6 +10,7 @@ #include <string> #include <utility> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "third_party/boringssl/src/include/openssl/sha.h" #include "third_party/boringssl/src/include/openssl/ssl.h" @@ -41,7 +42,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_cert_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_hostname_utils.h"
diff --git a/quic/core/http/http_decoder.cc b/quic/core/http/http_decoder.cc index 066592f..ab21d34 100644 --- a/quic/core/http/http_decoder.cc +++ b/quic/core/http/http_decoder.cc
@@ -6,6 +6,7 @@ #include <cstdint> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "net/third_party/quiche/src/http2/http2_constants.h" #include "net/third_party/quiche/src/quic/core/http/http_frames.h" @@ -13,7 +14,6 @@ #include "net/third_party/quiche/src/quic/core/quic_error_codes.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" namespace quic {
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index ac05d0f..8658f8e 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -10,6 +10,7 @@ #include <string> #include <utility> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "net/third_party/quiche/src/quic/core/http/http_constants.h" #include "net/third_party/quiche/src/quic/core/http/quic_headers_stream.h" @@ -19,7 +20,6 @@ #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_exported_stats.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" @@ -1046,11 +1046,11 @@ break; } case spdy::SETTINGS_ENABLE_PUSH: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case spdy::SETTINGS_MAX_CONCURRENT_STREAMS: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case spdy::SETTINGS_INITIAL_WINDOW_SIZE: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case spdy::SETTINGS_MAX_FRAME_SIZE: if (reject_spdy_settings_) { CloseConnectionWithDetails(
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc index bd80cf3..f461937 100644 --- a/quic/core/quic_framer.cc +++ b/quic/core/quic_framer.cc
@@ -11,6 +11,7 @@ #include <string> #include <utility> +#include "absl/base/attributes.h" #include "absl/base/macros.h" #include "absl/strings/string_view.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" @@ -39,7 +40,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_aligned.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_client_stats.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" @@ -945,7 +945,7 @@ break; case MTU_DISCOVERY_FRAME: // MTU discovery frames are serialized as ping frames. - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case PING_FRAME: // Ping has no payload. break; @@ -1091,7 +1091,7 @@ return 0; case MTU_DISCOVERY_FRAME: // MTU discovery frames are serialized as ping frames. - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case PING_FRAME: // Ping has no payload. break; @@ -3004,7 +3004,7 @@ continue; } case IETF_EXTENSION_MESSAGE_NO_LENGTH: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case IETF_EXTENSION_MESSAGE: { QuicMessageFrame message_frame; if (!ProcessMessageFrame(reader, @@ -3351,7 +3351,7 @@ break; } case IETF_EXTENSION_MESSAGE_NO_LENGTH_V99: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case IETF_EXTENSION_MESSAGE_V99: { QuicMessageFrame message_frame; if (!ProcessMessageFrame(
diff --git a/quic/platform/api/quic_fallthrough.h b/quic/platform/api/quic_fallthrough.h deleted file mode 100644 index 499b61a..0000000 --- a/quic/platform/api/quic_fallthrough.h +++ /dev/null
@@ -1,12 +0,0 @@ -// Copyright (c) 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_FALLTHROUGH_H_ -#define QUICHE_QUIC_PLATFORM_API_QUIC_FALLTHROUGH_H_ - -#include "net/quic/platform/impl/quic_fallthrough_impl.h" - -#define QUIC_FALLTHROUGH_INTENDED QUIC_FALLTHROUGH_INTENDED_IMPL - -#endif // QUICHE_QUIC_PLATFORM_API_QUIC_FALLTHROUGH_H_
diff --git a/quic/qbone/platform/netlink.cc b/quic/qbone/platform/netlink.cc index 719551d..d19c28b 100644 --- a/quic/qbone/platform/netlink.cc +++ b/quic/qbone/platform/netlink.cc
@@ -7,8 +7,8 @@ #include <linux/fib_rules.h> #include <utility> +#include "absl/base/attributes.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/quic/platform/impl/quic_ip_address_impl.h" @@ -259,7 +259,7 @@ switch (interface_address->ifa_family) { case AF_INET: - QUIC_FALLTHROUGH_INTENDED; + ABSL_FALLTHROUGH_INTENDED; case AF_INET6: // QuicIpAddress knows how to parse ip from raw bytes as long as they // are in network byte order.