Land Recent QUIC changes

net/quic/quic_session.h

 // 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.
 //
 // A QuicSession, which demuxes a single connection to individual streams.
 
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/blocked_list.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
+#include "net/quic/quic_spdy_compressor.h"
+#include "net/quic/quic_spdy_decompressor.h"
 #include "net/quic/reliable_quic_stream.h"
 
 namespace net {
 
 class QuicCryptoStream;
 class ReliableQuicStream;
 class VisitorShim;
 
 namespace test {
 class QuicSessionPeer;
@@ skipping 83 matching lines @@
   QuicGuid guid() const { return connection_->guid(); }
 
   QuicPacketCreator::Options* options() { return connection()->options(); }
 
   // Returns the number of currently open streams, including those which have
   // been implicitly created.
   virtual size_t GetNumOpenStreams() const;
 
   void MarkWriteBlocked(QuicStreamId id);
 
+  // Marks that |stream_id| is blocked waiting to decompress the
+  // headers identified by |decompression_id|.
+  void MarkDecompressionBlocked(QuicHeaderId decompression_id,
+                                QuicStreamId stream_id);
+
   bool goaway_received() const {
     return goaway_received_;
   }
 
   bool goaway_sent() const {
     return goaway_sent_;
   }
 
+  QuicSpdyDecompressor* decompressor() { return &decompressor_; }
+  QuicSpdyCompressor* compressor() { return &compressor_; }
+
  protected:
   // Creates a new stream, owned by the caller, to handle a peer-initiated
   // stream.  Returns NULL and does error handling if the stream can not be
   // created.
   virtual ReliableQuicStream* CreateIncomingReliableStream(QuicStreamId id) = 0;
 
   // Create a new stream, owned by the caller, to handle a locally-initiated
   // stream.  Returns NULL if max streams have already been opened.
   virtual ReliableQuicStream* CreateOutgoingReliableStream() = 0;
 
@@ skipping 34 matching lines @@
   ReliableQuicStream* GetStream(const QuicStreamId stream_id);
 
   scoped_ptr<QuicConnection> connection_;
 
   // A shim to stand between the connection and the session, to handle stream
   // deletions.
   scoped_ptr<VisitorShim> visitor_shim_;
 
   std::vector<ReliableQuicStream*> closed_streams_;
 
+  QuicSpdyDecompressor decompressor_;
+  QuicSpdyCompressor compressor_;
+
   // Returns the maximum number of streams this connection can open.
   const size_t max_open_streams_;
 
   // Map from StreamId to pointers to streams that are owned by the caller.
   ReliableStreamMap stream_map_;
   QuicStreamId next_stream_id_;
   bool is_server_;
 
   // Set of stream ids that have been "implicitly created" by receipt
   // of a stream id larger than the next expected stream id.
   base::hash_set<QuicStreamId> implicitly_created_streams_;
 
   // A list of streams which need to write more data.
   BlockedList<QuicStreamId> write_blocked_streams_;
 
+  // A map of headers waiting to be compressed, and the streams
+  // they are associated with.
+  map<uint32, QuicStreamId> decompression_blocked_streams_;
+
   QuicStreamId largest_peer_created_stream_id_;
 
   // Whether a GoAway has been received.
   bool goaway_received_;
   // Whether a GoAway has been sent.
   bool goaway_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_