| Index: net/spdy/hpack_decoder.cc
|
| diff --git a/net/spdy/hpack_decoder.cc b/net/spdy/hpack_decoder.cc
|
| index 6aa4f59a4352196cd04654c7b14908ce0a24ec42..cc8bba9d1a0926b166ad67ab21ca06b53b5f2492 100644
|
| --- a/net/spdy/hpack_decoder.cc
|
| +++ b/net/spdy/hpack_decoder.cc
|
| @@ -25,9 +25,11 @@ const uint8 kReferencedThisEncoding = 1;
|
|
|
| HpackDecoder::HpackDecoder(const HpackHuffmanTable& table)
|
| : max_string_literal_size_(kDefaultMaxStringLiteralSize),
|
| - huffman_table_(table) {}
|
| + huffman_table_(table) {
|
| +}
|
|
|
| -HpackDecoder::~HpackDecoder() {}
|
| +HpackDecoder::~HpackDecoder() {
|
| +}
|
|
|
| bool HpackDecoder::HandleControlFrameHeadersData(SpdyStreamId id,
|
| const char* headers_data,
|
| @@ -58,8 +60,9 @@ bool HpackDecoder::HandleControlFrameHeadersComplete(SpdyStreamId id) {
|
| // TODO(jgraettinger): We may need to revisit the order in which headers
|
| // are emitted (b/14051713).
|
| for (HpackEntry::OrderedSet::const_iterator it =
|
| - header_table_.reference_set().begin();
|
| - it != header_table_.reference_set().end(); ++it) {
|
| + header_table_.reference_set().begin();
|
| + it != header_table_.reference_set().end();
|
| + ++it) {
|
| HpackEntry* entry = *it;
|
|
|
| if (entry->state() == kNoState) {
|
| @@ -96,9 +99,8 @@ void HpackDecoder::HandleHeaderRepresentation(StringPiece name,
|
| std::make_pair(name.as_string(), value.as_string()));
|
| if (!result.second) {
|
| result.first->second.push_back('\0');
|
| - result.first->second.insert(result.first->second.end(),
|
| - value.begin(),
|
| - value.end());
|
| + result.first->second.insert(
|
| + result.first->second.end(), value.begin(), value.end());
|
| }
|
| }
|
| }
|
| @@ -160,8 +162,8 @@ bool HpackDecoder::DecodeNextIndexedHeader(HpackInputStream* input_stream) {
|
| if (entry->IsStatic()) {
|
| HandleHeaderRepresentation(entry->name(), entry->value());
|
|
|
| - HpackEntry* new_entry = header_table_.TryAddEntry(
|
| - entry->name(), entry->value());
|
| + HpackEntry* new_entry =
|
| + header_table_.TryAddEntry(entry->name(), entry->value());
|
| if (new_entry) {
|
| header_table_.Toggle(new_entry);
|
| new_entry->set_state(kReferencedThisEncoding);
|
| @@ -199,8 +201,8 @@ bool HpackDecoder::DecodeNextLiteralHeader(HpackInputStream* input_stream,
|
| return true;
|
| }
|
|
|
| -bool HpackDecoder::DecodeNextName(
|
| - HpackInputStream* input_stream, StringPiece* next_name) {
|
| +bool HpackDecoder::DecodeNextName(HpackInputStream* input_stream,
|
| + StringPiece* next_name) {
|
| uint32 index_or_zero = 0;
|
| if (!input_stream->DecodeNextUint32(&index_or_zero))
|
| return false;
|
| @@ -230,7 +232,7 @@ bool HpackDecoder::DecodeNextStringLiteral(HpackInputStream* input_stream,
|
| *output = StringPiece(*buffer);
|
| return result;
|
| } else if (input_stream->MatchPrefixAndConsume(
|
| - kStringLiteralIdentityEncoded)) {
|
| + kStringLiteralIdentityEncoded)) {
|
| return input_stream->DecodeNextIdentityString(output);
|
| } else {
|
| return false;
|
|
|