| Index: net/quic/quic_framer.cc
|
| diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
|
| index 3764d84b28054fb01853c81cd128997f8278ce27..4bf447d0d80eb35266429566d7612c84dad63e0c 100644
|
| --- a/net/quic/quic_framer.cc
|
| +++ b/net/quic/quic_framer.cc
|
| @@ -329,42 +329,42 @@ SerializedPacket QuicFramer::BuildDataPacket(
|
| writer.WritePadding();
|
| break;
|
| case STREAM_FRAME:
|
| - if (!AppendStreamFramePayload(
|
| + if (!AppendStreamFrame(
|
| *frame.stream_frame, last_frame_in_packet, &writer)) {
|
| - LOG(DFATAL) << "AppendStreamFramePayload failed";
|
| + LOG(DFATAL) << "AppendStreamFrame failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| case ACK_FRAME:
|
| - if (!AppendAckFramePayloadAndTypeByte(
|
| + if (!AppendAckFrameAndTypeByte(
|
| header, *frame.ack_frame, &writer)) {
|
| - LOG(DFATAL) << "AppendAckFramePayloadAndTypeByte failed";
|
| + LOG(DFATAL) << "AppendAckFrameAndTypeByte failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| case CONGESTION_FEEDBACK_FRAME:
|
| - if (!AppendQuicCongestionFeedbackFramePayload(
|
| + if (!AppendQuicCongestionFeedbackFrame(
|
| *frame.congestion_feedback_frame, &writer)) {
|
| - LOG(DFATAL) << "AppendQuicCongestionFeedbackFramePayload failed";
|
| + LOG(DFATAL) << "AppendQuicCongestionFeedbackFrame failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| case RST_STREAM_FRAME:
|
| - if (!AppendRstStreamFramePayload(*frame.rst_stream_frame, &writer)) {
|
| - LOG(DFATAL) << "AppendRstStreamFramePayload failed";
|
| + if (!AppendRstStreamFrame(*frame.rst_stream_frame, &writer)) {
|
| + LOG(DFATAL) << "AppendRstStreamFrame failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| case CONNECTION_CLOSE_FRAME:
|
| - if (!AppendConnectionCloseFramePayload(
|
| + if (!AppendConnectionCloseFrame(
|
| *frame.connection_close_frame, &writer)) {
|
| - LOG(DFATAL) << "AppendConnectionCloseFramePayload failed";
|
| + LOG(DFATAL) << "AppendConnectionCloseFrame failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| case GOAWAY_FRAME:
|
| - if (!AppendGoAwayFramePayload(*frame.goaway_frame, &writer)) {
|
| - LOG(DFATAL) << "AppendGoAwayFramePayload failed";
|
| + if (!AppendGoAwayFrame(*frame.goaway_frame, &writer)) {
|
| + LOG(DFATAL) << "AppendGoAwayFrame failed";
|
| return kNoPacket;
|
| }
|
| break;
|
| @@ -1750,7 +1750,7 @@ bool QuicFramer::AppendPacketSequenceNumber(
|
| }
|
| }
|
|
|
| -bool QuicFramer::AppendStreamFramePayload(
|
| +bool QuicFramer::AppendStreamFrame(
|
| const QuicStreamFrame& frame,
|
| bool last_frame_in_packet,
|
| QuicDataWriter* writer) {
|
| @@ -1778,7 +1778,7 @@ void QuicFramer::set_version(const QuicVersion version) {
|
| quic_version_ = version;
|
| }
|
|
|
| -bool QuicFramer::AppendAckFramePayloadAndTypeByte(
|
| +bool QuicFramer::AppendAckFrameAndTypeByte(
|
| const QuicPacketHeader& header,
|
| const QuicAckFrame& frame,
|
| QuicDataWriter* writer) {
|
| @@ -1913,7 +1913,7 @@ bool QuicFramer::AppendAckFramePayloadAndTypeByte(
|
| return true;
|
| }
|
|
|
| -bool QuicFramer::AppendQuicCongestionFeedbackFramePayload(
|
| +bool QuicFramer::AppendQuicCongestionFeedbackFrame(
|
| const QuicCongestionFeedbackFrame& frame,
|
| QuicDataWriter* writer) {
|
| if (!writer->WriteBytes(&frame.type, 1)) {
|
| @@ -2003,7 +2003,7 @@ bool QuicFramer::AppendQuicCongestionFeedbackFramePayload(
|
| return true;
|
| }
|
|
|
| -bool QuicFramer::AppendRstStreamFramePayload(
|
| +bool QuicFramer::AppendRstStreamFrame(
|
| const QuicRstStreamFrame& frame,
|
| QuicDataWriter* writer) {
|
| if (!writer->WriteUInt32(frame.stream_id)) {
|
| @@ -2021,7 +2021,7 @@ bool QuicFramer::AppendRstStreamFramePayload(
|
| return true;
|
| }
|
|
|
| -bool QuicFramer::AppendConnectionCloseFramePayload(
|
| +bool QuicFramer::AppendConnectionCloseFrame(
|
| const QuicConnectionCloseFrame& frame,
|
| QuicDataWriter* writer) {
|
| uint32 error_code = static_cast<uint32>(frame.error_code);
|
| @@ -2034,8 +2034,8 @@ bool QuicFramer::AppendConnectionCloseFramePayload(
|
| return true;
|
| }
|
|
|
| -bool QuicFramer::AppendGoAwayFramePayload(const QuicGoAwayFrame& frame,
|
| - QuicDataWriter* writer) {
|
| +bool QuicFramer::AppendGoAwayFrame(const QuicGoAwayFrame& frame,
|
| + QuicDataWriter* writer) {
|
| uint32 error_code = static_cast<uint32>(frame.error_code);
|
| if (!writer->WriteUInt32(error_code)) {
|
| return false;
|
|
|