| Index: net/quic/quic_connection.cc
|
| diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
|
| index 778d6d0c51ee5353784a053866bef381235e756e..ce3b0010aa578b46dcbce3bcb5af68ff0e559bb9 100644
|
| --- a/net/quic/quic_connection.cc
|
| +++ b/net/quic/quic_connection.cc
|
| @@ -1439,15 +1439,14 @@ bool QuicConnection::WritePacketInner(QueuedPacket* packet) {
|
| }
|
| DCHECK_LE(encrypted->length(), packet_generator_.max_packet_length());
|
| DVLOG(1) << ENDPOINT << "Sending packet " << sequence_number << " : "
|
| - << (packet->serialized_packet.packet->is_fec_packet() ? "FEC " :
|
| - (IsRetransmittable(*packet) == HAS_RETRANSMITTABLE_DATA
|
| - ? "data bearing " : " ack only "))
|
| - << ", encryption level: "
|
| + << (packet->serialized_packet.is_fec_packet
|
| + ? "FEC "
|
| + : (IsRetransmittable(*packet) == HAS_RETRANSMITTABLE_DATA
|
| + ? "data bearing "
|
| + : " ack only ")) << ", encryption level: "
|
| << QuicUtils::EncryptionLevelToString(packet->encryption_level)
|
| - << ", length:"
|
| - << packet->serialized_packet.packet->length()
|
| - << ", encrypted length:"
|
| - << encrypted->length();
|
| + << ", length:" << packet->serialized_packet.packet->length()
|
| + << ", encrypted length:" << encrypted->length();
|
| DVLOG(2) << ENDPOINT << "packet(" << sequence_number << "): " << std::endl
|
| << QuicUtils::StringToHexASCIIDump(
|
| packet->serialized_packet.packet->AsStringPiece());
|
| @@ -1604,7 +1603,7 @@ void QuicConnection::OnSerializedPacket(
|
| sent_packet_manager_.OnSerializedPacket(serialized_packet);
|
| }
|
| }
|
| - if (serialized_packet.packet->is_fec_packet() && fec_alarm_->IsSet()) {
|
| + if (serialized_packet.is_fec_packet && fec_alarm_->IsSet()) {
|
| // If an FEC packet is serialized with the FEC alarm set, cancel the alarm.
|
| fec_alarm_->Cancel();
|
| }
|
|
|