| Index: net/spdy/spdy_frame_builder.cc
|
| diff --git a/net/spdy/spdy_frame_builder.cc b/net/spdy/spdy_frame_builder.cc
|
| index a7eb91d71ce8199d9e68b08831340d5580045670..a6f81d7292c999d1b95f2710513b9353bd3b7e55 100644
|
| --- a/net/spdy/spdy_frame_builder.cc
|
| +++ b/net/spdy/spdy_frame_builder.cc
|
| @@ -32,7 +32,7 @@ FlagsAndLength CreateFlagsAndLength(uint8 flags, size_t length) {
|
|
|
| } // namespace
|
|
|
| - SpdyFrameBuilder::SpdyFrameBuilder(size_t size, SpdyMajorVersion version)
|
| +SpdyFrameBuilder::SpdyFrameBuilder(size_t size, SpdyMajorVersion version)
|
| : buffer_(new char[size]),
|
| capacity_(size),
|
| length_(0),
|
| @@ -63,8 +63,7 @@ bool SpdyFrameBuilder::WriteControlFrameHeader(const SpdyFramer& framer,
|
| SpdyFrameType type,
|
| uint8 flags) {
|
| DCHECK_GE(SPDY3, version_);
|
| - DCHECK_NE(-1,
|
| - SpdyConstants::SerializeFrameType(version_, type));
|
| + DCHECK_NE(-1, SpdyConstants::SerializeFrameType(version_, type));
|
| bool success = true;
|
| FlagsAndLength flags_length = CreateFlagsAndLength(
|
| flags, capacity_ - framer.GetControlFrameHeaderSize());
|
| @@ -101,8 +100,8 @@ bool SpdyFrameBuilder::BeginNewFrame(const SpdyFramer& framer,
|
| SpdyFrameType type,
|
| uint8 flags,
|
| SpdyStreamId stream_id) {
|
| - DCHECK(SpdyConstants::IsValidFrameType(version_,
|
| - SpdyConstants::SerializeFrameType(version_, type)));
|
| + DCHECK(SpdyConstants::IsValidFrameType(
|
| + version_, SpdyConstants::SerializeFrameType(version_, type)));
|
| DCHECK_EQ(0u, stream_id & ~kStreamIdMask);
|
| DCHECK_LT(SPDY3, framer.protocol_version());
|
| bool success = true;
|
| @@ -122,8 +121,7 @@ bool SpdyFrameBuilder::BeginNewFrame(const SpdyFramer& framer,
|
| // Don't check for length limits here because this may be larger than the
|
| // actual frame length.
|
| success &= WriteUInt16(capacity_ - offset_ - framer.GetPrefixLength(type));
|
| - success &= WriteUInt8(
|
| - SpdyConstants::SerializeFrameType(version_, type));
|
| + success &= WriteUInt8(SpdyConstants::SerializeFrameType(version_, type));
|
| success &= WriteUInt8(flags);
|
| success &= WriteUInt32(stream_id);
|
| DCHECK_EQ(framer.GetDataFrameMinimumSize(), length_);
|
| @@ -162,15 +160,14 @@ bool SpdyFrameBuilder::WriteBytes(const void* data, uint32 data_len) {
|
| }
|
|
|
| bool SpdyFrameBuilder::RewriteLength(const SpdyFramer& framer) {
|
| - return OverwriteLength(framer,
|
| - length_ - framer.GetControlFrameHeaderSize());
|
| + return OverwriteLength(framer, length_ - framer.GetControlFrameHeaderSize());
|
| }
|
|
|
| bool SpdyFrameBuilder::OverwriteLength(const SpdyFramer& framer,
|
| size_t length) {
|
| if (version_ <= SPDY3) {
|
| DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_) -
|
| - framer.GetFrameMinimumSize(),
|
| + framer.GetFrameMinimumSize(),
|
| length);
|
| } else {
|
| DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_), length);
|
| @@ -196,8 +193,7 @@ bool SpdyFrameBuilder::OverwriteLength(const SpdyFramer& framer,
|
| return success;
|
| }
|
|
|
| -bool SpdyFrameBuilder::OverwriteFlags(const SpdyFramer& framer,
|
| - uint8 flags) {
|
| +bool SpdyFrameBuilder::OverwriteFlags(const SpdyFramer& framer, uint8 flags) {
|
| DCHECK_LT(SPDY3, framer.protocol_version());
|
| bool success = false;
|
| const size_t old_length = length_;
|
|
|