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>
@@ skipping 48 matching lines @@
   virtual ~QuicSession();
 
   // QuicConnectionVisitorInterface methods:
   virtual bool OnPacket(const IPEndPoint& self_address,
                         const IPEndPoint& peer_address,
                         const QuicPacketHeader& header,
                         const std::vector<QuicStreamFrame>& frame) OVERRIDE;
   virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE;
   virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE;
   virtual void ConnectionClose(QuicErrorCode error, bool from_peer) OVERRIDE;
+  virtual void OnSuccessfulVersionNegotiation(
+      const QuicVersion& version) OVERRIDE{}
   // Not needed for HTTP.
   virtual void OnAck(const SequenceNumberSet& acked_packets) OVERRIDE {}
   virtual bool OnCanWrite() OVERRIDE;
 
   // Called by streams when they want to write data to the peer.
   // Returns a pair with the number of bytes consumed from data, and a boolean
   // indicating if the fin bit was consumed.  This does not indicate the data
   // has been sent on the wire: it may have been turned into a packet and queued
   // if the socket was unexpectedly blocked.
-  virtual QuicConsumedData WriteData(QuicStreamId id,
-                                     base::StringPiece data,
-                                     QuicStreamOffset offset,
-                                     bool fin);
+  virtual QuicConsumedData WritevData(QuicStreamId id,
+                                      const struct iovec* iov,
+                                      int count,
+                                      QuicStreamOffset offset,
+                                      bool fin);
+
   // Called by streams when they want to close the stream in both directions.
   virtual void SendRstStream(QuicStreamId id, QuicRstStreamErrorCode error);
 
   // Called when the session wants to go away and not accept any new streams.
   void SendGoAway(QuicErrorCode error_code, const std::string& reason);
 
   // Removes the stream associated with 'stream_id' from the active stream map.
   virtual void CloseStream(QuicStreamId stream_id);
 
   // Returns true if outgoing packets will be encrypted, even if the server
@@ skipping 38 matching lines @@
     return connection_->peer_address();
   }
   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);
+  void MarkWriteBlocked(QuicStreamId id, QuicPriority priority);
 
   // 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_;
   }
 
@@ skipping 130 matching lines @@
   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_