Index: net/spdy/spdy_protocol.cc |
diff --git a/net/spdy/spdy_protocol.cc b/net/spdy/spdy_protocol.cc |
index b7867977e73780ccdd615505f8ac49ca48d4067d..fb5efc4e65e542b92019e883c47be02d01c6b375 100644 |
--- a/net/spdy/spdy_protocol.cc |
+++ b/net/spdy/spdy_protocol.cc |
@@ -7,9 +7,12 @@ |
namespace net { |
SpdyFrameWithNameValueBlockIR::SpdyFrameWithNameValueBlockIR( |
- SpdyStreamId stream_id) : SpdyFrameWithFinIR(stream_id) {} |
+ SpdyStreamId stream_id) |
+ : SpdyFrameWithFinIR(stream_id) { |
+} |
-SpdyFrameWithNameValueBlockIR::~SpdyFrameWithNameValueBlockIR() {} |
+SpdyFrameWithNameValueBlockIR::~SpdyFrameWithNameValueBlockIR() { |
+} |
SpdyDataIR::SpdyDataIR(SpdyStreamId stream_id, const base::StringPiece& data) |
: SpdyFrameWithFinIR(stream_id), |
@@ -23,9 +26,11 @@ SpdyDataIR::SpdyDataIR(SpdyStreamId stream_id) |
: SpdyFrameWithFinIR(stream_id), |
pad_low_(false), |
pad_high_(false), |
- padding_payload_len_(0) {} |
+ padding_payload_len_(0) { |
+} |
-SpdyDataIR::~SpdyDataIR() {} |
+SpdyDataIR::~SpdyDataIR() { |
+} |
bool SpdyConstants::IsValidFrameType(SpdyMajorVersion version, |
int frame_type_field) { |
@@ -264,7 +269,7 @@ SpdySettingsIds SpdyConstants::ParseSettingId(SpdyMajorVersion version, |
} |
int SpdyConstants::SerializeSettingId(SpdyMajorVersion version, |
- SpdySettingsIds id) { |
+ SpdySettingsIds id) { |
switch (version) { |
case SPDY2: |
case SPDY3: |
@@ -446,8 +451,7 @@ int SpdyConstants::SerializeRstStreamStatus( |
case RST_STREAM_FRAME_TOO_LARGE: |
return 11; |
default: |
- LOG(DFATAL) << "Unhandled RST_STREAM status " |
- << rst_stream_status; |
+ LOG(DFATAL) << "Unhandled RST_STREAM status " << rst_stream_status; |
return -1; |
} |
case SPDY4: |
@@ -472,8 +476,7 @@ int SpdyConstants::SerializeRstStreamStatus( |
case RST_STREAM_ENHANCE_YOUR_CALM: |
return 11; |
default: |
- LOG(DFATAL) << "Unhandled RST_STREAM status " |
- << rst_stream_status; |
+ LOG(DFATAL) << "Unhandled RST_STREAM status " << rst_stream_status; |
return -1; |
} |
} |
@@ -492,8 +495,8 @@ bool SpdyConstants::IsValidGoAwayStatus(SpdyMajorVersion version, |
} |
// GOAWAY_INTERNAL_ERROR is the last valid status. |
- if (goaway_status_field > SerializeGoAwayStatus(version, |
- GOAWAY_INTERNAL_ERROR)) { |
+ if (goaway_status_field > |
+ SerializeGoAwayStatus(version, GOAWAY_INTERNAL_ERROR)) { |
return false; |
} |
@@ -501,8 +504,8 @@ bool SpdyConstants::IsValidGoAwayStatus(SpdyMajorVersion version, |
case SPDY4: |
case SPDY5: |
// GOAWAY_NO_ERROR is the first valid status. |
- if (goaway_status_field < SerializeGoAwayStatus(version, |
- GOAWAY_NO_ERROR)) { |
+ if (goaway_status_field < |
+ SerializeGoAwayStatus(version, GOAWAY_NO_ERROR)) { |
return false; |
} |
@@ -690,19 +693,19 @@ size_t SpdyConstants::GetControlFrameHeaderSize(SpdyMajorVersion version) { |
size_t SpdyConstants::GetPrefixLength(SpdyFrameType type, |
SpdyMajorVersion version) { |
if (type != DATA) { |
- return GetControlFrameHeaderSize(version); |
+ return GetControlFrameHeaderSize(version); |
} else { |
- return GetDataFrameMinimumSize(); |
+ return GetDataFrameMinimumSize(); |
} |
} |
size_t SpdyConstants::GetFrameMaximumSize(SpdyMajorVersion version) { |
if (version < SPDY4) { |
// 24-bit length field plus eight-byte frame header. |
- return ((1<<24) - 1) + 8; |
+ return ((1 << 24) - 1) + 8; |
} else { |
// 14-bit length field. |
- return (1<<14) - 1; |
+ return (1 << 14) - 1; |
} |
} |
@@ -721,22 +724,22 @@ void SpdySynReplyIR::Visit(SpdyFrameVisitor* visitor) const { |
SpdyRstStreamIR::SpdyRstStreamIR(SpdyStreamId stream_id, |
SpdyRstStreamStatus status, |
base::StringPiece description) |
- : SpdyFrameWithStreamIdIR(stream_id), |
- description_(description) { |
+ : SpdyFrameWithStreamIdIR(stream_id), description_(description) { |
set_status(status); |
} |
-SpdyRstStreamIR::~SpdyRstStreamIR() {} |
+SpdyRstStreamIR::~SpdyRstStreamIR() { |
+} |
void SpdyRstStreamIR::Visit(SpdyFrameVisitor* visitor) const { |
return visitor->VisitRstStream(*this); |
} |
-SpdySettingsIR::SpdySettingsIR() |
- : clear_settings_(false), |
- is_ack_(false) {} |
+SpdySettingsIR::SpdySettingsIR() : clear_settings_(false), is_ack_(false) { |
+} |
-SpdySettingsIR::~SpdySettingsIR() {} |
+SpdySettingsIR::~SpdySettingsIR() { |
+} |
void SpdySettingsIR::Visit(SpdyFrameVisitor* visitor) const { |
return visitor->VisitSettings(*this); |
@@ -750,11 +753,12 @@ SpdyGoAwayIR::SpdyGoAwayIR(SpdyStreamId last_good_stream_id, |
SpdyGoAwayStatus status, |
const base::StringPiece& description) |
: description_(description) { |
- set_last_good_stream_id(last_good_stream_id); |
+ set_last_good_stream_id(last_good_stream_id); |
set_status(status); |
} |
-SpdyGoAwayIR::~SpdyGoAwayIR() {} |
+SpdyGoAwayIR::~SpdyGoAwayIR() { |
+} |
const base::StringPiece& SpdyGoAwayIR::description() const { |
return description_; |