| Index: net/quic/core/quic_framer.h
|
| diff --git a/net/quic/core/quic_framer.h b/net/quic/core/quic_framer.h
|
| index 8347fb26e6e592a98cbfff3186d01c98d79821c4..60d71d8f1ecf658c81e2a5323c13dd6991bae72a 100644
|
| --- a/net/quic/core/quic_framer.h
|
| +++ b/net/quic/core/quic_framer.h
|
| @@ -347,11 +347,10 @@ class NET_EXPORT_PRIVATE QuicFramer {
|
|
|
| typedef std::map<QuicPacketNumber, uint8_t> NackRangeMap;
|
|
|
| - // TODO(rch): Rename this to remove "New" from the name here, and elsewhere.
|
| - struct NewAckFrameInfo {
|
| - NewAckFrameInfo();
|
| - NewAckFrameInfo(const NewAckFrameInfo& other);
|
| - ~NewAckFrameInfo();
|
| + struct AckFrameInfo {
|
| + AckFrameInfo();
|
| + AckFrameInfo(const AckFrameInfo& other);
|
| + ~AckFrameInfo();
|
|
|
| // The maximum ack block length.
|
| QuicPacketNumber max_block_length;
|
| @@ -390,9 +389,9 @@ class NET_EXPORT_PRIVATE QuicFramer {
|
| bool ProcessStreamFrame(QuicDataReader* reader,
|
| uint8_t frame_type,
|
| QuicStreamFrame* frame);
|
| - bool ProcessNewAckFrame(QuicDataReader* reader,
|
| - uint8_t frame_type,
|
| - QuicAckFrame* frame);
|
| + bool ProcessAckFrame(QuicDataReader* reader,
|
| + uint8_t frame_type,
|
| + QuicAckFrame* frame);
|
| bool ProcessTimestampsInAckFrame(QuicDataReader* reader, QuicAckFrame* frame);
|
| bool ProcessStopWaitingFrame(QuicDataReader* reader,
|
| const QuicPacketHeader& public_header,
|
| @@ -442,7 +441,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
|
| QuicPacketNumberLength packet_number_length);
|
|
|
| // Computes the wire size in bytes of the |ack| frame.
|
| - size_t GetNewAckFrameSize(const QuicAckFrame& ack);
|
| + size_t GetAckFrameSize(const QuicAckFrame& ack);
|
|
|
| // Computes the wire size in bytes of the payload of |frame|.
|
| size_t ComputeFrameLength(const QuicFrame& frame,
|
| @@ -464,13 +463,13 @@ class NET_EXPORT_PRIVATE QuicFramer {
|
| static uint8_t GetSequenceNumberFlags(
|
| QuicPacketNumberLength packet_number_length);
|
|
|
| - static NewAckFrameInfo GetNewAckFrameInfo(const QuicAckFrame& frame);
|
| + static AckFrameInfo GetAckFrameInfo(const QuicAckFrame& frame);
|
|
|
| // The Append* methods attempt to write the provided header or frame using the
|
| // |writer|, and return true if successful.
|
|
|
| - bool AppendNewAckFrameAndTypeByte(const QuicAckFrame& frame,
|
| - QuicDataWriter* builder);
|
| + bool AppendAckFrameAndTypeByte(const QuicAckFrame& frame,
|
| + QuicDataWriter* builder);
|
| bool AppendTimestampToAckFrame(const QuicAckFrame& frame,
|
| QuicDataWriter* builder);
|
| bool AppendStopWaitingFrame(const QuicPacketHeader& header,
|
|
|