Land Recent QUIC changes

net/quic/quic_session.cc

 // Copyright (c) 2012 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_session.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_connection.h"
 
 using base::StringPiece;
@@ skipping 90 matching lines @@
     // TODO(alyssar) check against existing connection address: if changed, make
     // sure we update the connection.
   }
 
   for (size_t i = 0; i < frames.size(); ++i) {
     ReliableQuicStream* stream = GetStream(frames[i].stream_id);
     if (stream) {
       stream->OnStreamFrame(frames[i]);
     }
   }
+
+  while (!decompression_blocked_streams_.empty()) {
+    QuicHeaderId header_id = decompression_blocked_streams_.begin()->first;
+    if (header_id == decompressor_.current_header_id()) {
+      QuicStreamId stream_id = decompression_blocked_streams_.begin()->second;
+      decompression_blocked_streams_.erase(header_id);
+      ReliableQuicStream* stream = GetStream(stream_id);
+      if (!stream) {
+        connection()->SendConnectionClose(
+            QUIC_STREAM_RST_BEFORE_HEADERS_DECOMPRESSED);
+      }
+      stream->OnDecompressorAvailable();
+    }
+  }
   return true;
 }
 
 void QuicSession::OnRstStream(const QuicRstStreamFrame& frame) {
   ReliableQuicStream* stream = GetStream(frame.stream_id);
   if (!stream) {
     return;  // Errors are handled by GetStream.
   }
   stream->OnStreamReset(frame.error_code);
 }
@@ skipping 174 matching lines @@
 }
 
 size_t QuicSession::GetNumOpenStreams() const {
   return stream_map_.size() + implicitly_created_streams_.size();
 }
 
 void QuicSession::MarkWriteBlocked(QuicStreamId id) {
   write_blocked_streams_.AddBlockedObject(id);
 }
 
+void QuicSession::MarkDecompressionBlocked(QuicHeaderId header_id,
+                                           QuicStreamId stream_id) {
+  decompression_blocked_streams_[header_id] = stream_id;
+}
+
 void QuicSession::PostProcessAfterData() {
   STLDeleteElements(&closed_streams_);
   closed_streams_.clear();
 }
 
 }  // namespace net