Update HPACK implementation to draft-09

net/spdy/hpack_decoder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/hpack_decoder.h"
 
+#include <utility>

[Johnny, 2014/08/06 15:04:49]

I don't see a use of this below?

[Bence, 2014/08/06 20:20:22]

It's for std::pair.  git cl lint complains if this include is missing.

[Johnny, 2014/08/07 17:02:22]

Oh, great. SGTM then.

[Bence, 2014/08/08 13:57:55]

Acknowledged.

+
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/spdy/hpack_constants.h"
 #include "net/spdy/hpack_output_stream.h"
 
 namespace net {
 
 using base::StringPiece;
 using std::string;
 
 namespace {
 
-const uint8 kNoState = 0;
-// Set on entries added to the reference set during this decoding.
-const uint8 kReferencedThisEncoding = 1;
-
 const char kCookieKey[] = "cookie";
 
 }  // namespace
 
 HpackDecoder::HpackDecoder(const HpackHuffmanTable& table)
     : max_string_literal_size_(kDefaultMaxStringLiteralSize),
       huffman_table_(table) {}
 
 HpackDecoder::~HpackDecoder() {}
 
@@ skipping 16 matching lines @@
   HpackInputStream input_stream(max_string_literal_size_,
                                 headers_block_buffer_);
   while (input_stream.HasMoreData()) {
     if (!DecodeNextOpcode(&input_stream)) {
       headers_block_buffer_.clear();
       return false;
     }
   }
   headers_block_buffer_.clear();
 
-  // Emit everything in the reference set that hasn't already been emitted.
-  // Also clear entry state for the next decoded headers block.
-  // TODO(jgraettinger): We may need to revisit the order in which headers
-  // are emitted (b/14051713).
-  for (HpackHeaderTable::OrderedEntrySet::const_iterator it =
-          header_table_.reference_set().begin();
-       it != header_table_.reference_set().end(); ++it) {
-    HpackEntry* entry = *it;
-
-    if (entry->state() == kNoState) {
-      HandleHeaderRepresentation(entry->name(), entry->value());
-    } else {
-      entry->set_state(kNoState);
-    }
-  }
   // Emit the Cookie header, if any crumbles were encountered.
   if (!cookie_value_.empty()) {
     decoded_block_[kCookieKey] = cookie_value_;
     cookie_value_.clear();
   }
   return true;
 }
 
 void HpackDecoder::HandleHeaderRepresentation(StringPiece name,
                                               StringPiece value) {
@@ skipping 30 matching lines @@
   // Implements 4.3.2: Literal Header Field with Incremental Indexing.
   if (input_stream->MatchPrefixAndConsume(kLiteralIncrementalIndexOpcode)) {
     return DecodeNextLiteralHeader(input_stream, true);
   }
   // Implements 4.3.3: Literal Header Field never Indexed.
   // TODO(jgraettinger): Preserve the never-indexed bit.
   if (input_stream->MatchPrefixAndConsume(kLiteralNeverIndexOpcode)) {
     return DecodeNextLiteralHeader(input_stream, false);
   }
   // Implements 4.4: Encoding context update.
-  if (input_stream->MatchPrefixAndConsume(kEncodingContextOpcode)) {
-    return DecodeNextContextUpdate(input_stream);
+  if (input_stream->MatchPrefixAndConsume(kHeaderTableSizeUpdateOpcode)) {
+    return DecodeNextHeaderTableSizeUpdate(input_stream);
   }
   // Unrecognized opcode.
   return false;
 }
 
-bool HpackDecoder::DecodeNextContextUpdate(HpackInputStream* input_stream) {
-  if (input_stream->MatchPrefixAndConsume(kEncodingContextEmptyReferenceSet)) {
-    header_table_.ClearReferenceSet();
-    return true;
+bool HpackDecoder::DecodeNextHeaderTableSizeUpdate(
+    HpackInputStream* input_stream) {
+  uint32 size = 0;
+  if (!input_stream->DecodeNextUint32(&size)) {
+    return false;
   }
-  if (input_stream->MatchPrefixAndConsume(kEncodingContextNewMaximumSize)) {
-    uint32 size = 0;
-    if (!input_stream->DecodeNextUint32(&size)) {
-      return false;
-    }
-    if (size > header_table_.settings_size_bound()) {
-      return false;
-    }
-    header_table_.SetMaxSize(size);
-    return true;
+  if (size > header_table_.settings_size_bound()) {
+    return false;
   }
-  // Unrecognized encoding context update.
-  return false;
+  header_table_.SetMaxSize(size);
+  return true;
 }
 
 bool HpackDecoder::DecodeNextIndexedHeader(HpackInputStream* input_stream) {
   uint32 index = 0;
   if (!input_stream->DecodeNextUint32(&index))
     return false;
 
   HpackEntry* entry = header_table_.GetByIndex(index);
   if (entry == NULL)
     return false;
 
-  if (entry->IsStatic()) {
-    HandleHeaderRepresentation(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);
-    }
-  } else {
-    entry->set_state(kNoState);
-    if (header_table_.Toggle(entry)) {
-      HandleHeaderRepresentation(entry->name(), entry->value());
-      entry->set_state(kReferencedThisEncoding);
-    }
-  }
+  HandleHeaderRepresentation(entry->name(), entry->value());
   return true;
 }
 
 bool HpackDecoder::DecodeNextLiteralHeader(HpackInputStream* input_stream,
                                            bool should_index) {
   StringPiece name;
   if (!DecodeNextName(input_stream, &name))
     return false;
 
   StringPiece value;
   if (!DecodeNextStringLiteral(input_stream, false, &value))
     return false;
 
   HandleHeaderRepresentation(name, value);
 
   if (!should_index)
     return true;
 
-  HpackEntry* new_entry = header_table_.TryAddEntry(name, value);
-  if (new_entry) {
-    header_table_.Toggle(new_entry);
-    new_entry->set_state(kReferencedThisEncoding);
-  }
+  header_table_.TryAddEntry(name, value);

[Johnny, 2014/08/06 15:04:49]

ignore_result

[Bence, 2014/08/06 20:20:22]

Done.

   return true;
 }
 
 bool HpackDecoder::DecodeNextName(
     HpackInputStream* input_stream, StringPiece* next_name) {
   uint32 index_or_zero = 0;
   if (!input_stream->DecodeNextUint32(&index_or_zero))
     return false;
 
   if (index_or_zero == 0)
@@ skipping 22 matching lines @@
     return result;
   } else if (input_stream->MatchPrefixAndConsume(
       kStringLiteralIdentityEncoded)) {
     return input_stream->DecodeNextIdentityString(output);
   } else {
     return false;
   }
 }
 
 }  // namespace net