Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/quic/quic_spdy_stream.cc

 // Copyright 2013 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/quic/quic_spdy_stream.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_spdy_session.h"
@@ skipping 77 matching lines @@
 size_t QuicSpdyStream::WriteTrailers(
     SpdyHeaderBlock trailer_block,
     QuicAckListenerInterface* ack_notifier_delegate) {
   if (fin_sent()) {
     QUIC_BUG << "Trailers cannot be sent after a FIN.";
     return 0;
   }
 
   // The header block must contain the final offset for this stream, as the
   // trailers may be processed out of order at the peer.
+  DVLOG(1) << "Inserting trailer: (" << kFinalOffsetHeaderKey << ", "
+           << stream_bytes_written() + queued_data_bytes() << ")";
   trailer_block.insert(std::make_pair(
       kFinalOffsetHeaderKey,
       base::IntToString(stream_bytes_written() + queued_data_bytes())));
 
   // Write the trailing headers with a FIN, and close stream for writing:
   // trailers are the last thing to be sent on a stream.
   const bool kFin = true;
   size_t bytes_written = spdy_session_->WriteHeaders(
       id(), trailer_block, kFin, priority_, ack_notifier_delegate);
   set_fin_sent(kFin);
@@ skipping 40 matching lines @@
   decompressed_headers_.erase(0, bytes_consumed);
   if (FinishedReadingHeaders()) {
     sequencer()->SetUnblocked();
   }
 }
 
 void QuicSpdyStream::MarkTrailersConsumed(size_t bytes_consumed) {
   decompressed_trailers_.erase(0, bytes_consumed);
 }
 
+void QuicSpdyStream::ConsumeHeaderList() {
+  header_list_.Clear();
+  if (FinishedReadingHeaders()) {
+    sequencer()->SetUnblocked();
+  }
+}
+
 void QuicSpdyStream::SetPriority(SpdyPriority priority) {
   DCHECK_EQ(0u, stream_bytes_written());
   spdy_session_->UpdateStreamPriority(id(), priority);
   priority_ = priority;
 }
 
 void QuicSpdyStream::OnStreamHeaders(StringPiece headers_data) {
   if (!headers_decompressed_) {
     headers_data.AppendToString(&decompressed_headers_);
   } else {
@@ skipping 197 matching lines @@
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
   bool no_more_trailers = fin_received() || trailers_decompressed_;
   return no_more_trailers && decompressed_trailers_.empty();
 }
 
 SpdyPriority QuicSpdyStream::priority() const {
   return priority_;
 }
 }  // namespace net