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 36 matching lines @@
     // connection should resend any packets that were sent under
     // ENCRYPTION_INITIAL. (Client only.)
     ENCRYPTION_REESTABLISHED,
     // HANDSHAKE_CONFIRMED, in a client, indicates the the server has accepted
     // our handshake. In a server it indicates that a full, valid client hello
     // has been received. (Client and server.)
     HANDSHAKE_CONFIRMED,
   };
 
   QuicSession(QuicConnection* connection,
-              uint32 max_flow_control_receive_window_bytes,
               const QuicConfig& config);

[wtc, 2014/06/16 19:35:56]

Nit: this may fit on the previous line now.

[ramant (doing other things), 2014/06/16 21:13:53]

Done.

 
   virtual ~QuicSession();
 
   // QuicConnectionVisitorInterface methods:
   virtual void OnStreamFrames(
       const std::vector<QuicStreamFrame>& frames) OVERRIDE;
   virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE;
   virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE;
   virtual void OnWindowUpdateFrames(
       const std::vector<QuicWindowUpdateFrame>& frames) OVERRIDE;
@@ skipping 129 matching lines @@
     return goaway_sent_;
   }
 
   // Gets the SSL connection information.
   virtual bool GetSSLInfo(SSLInfo* ssl_info) const;
 
   QuicErrorCode error() const { return error_; }
 
   bool is_server() const { return connection_->is_server(); }
 
-  uint32 max_flow_control_receive_window_bytes() {
-    return max_flow_control_receive_window_bytes_;
-  }
-
   QuicFlowController* flow_controller() { return flow_controller_.get(); }
 
  protected:
   typedef base::hash_map<QuicStreamId, QuicDataStream*> DataStreamMap;
 
   // 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 QuicDataStream* CreateIncomingDataStream(QuicStreamId id) = 0;
 
@@ skipping 44 matching lines @@
   // then the stream has been reset by this endpoint, not by the peer.
   void CloseStreamInner(QuicStreamId stream_id, bool locally_reset);
 
   // When a stream is closed locally, it may not yet know how many bytes the
   // peer sent on that stream.
   // When this data arrives (via stream frame w. FIN, or RST) this method
   // is called, and correctly updates the connection level flow controller.
   void UpdateFlowControlOnFinalReceivedByteOffset(
       QuicStreamId id, QuicStreamOffset final_byte_offset);
 
+  // Called in OnConfigNegotiated when we receive a new stream level flow
+  // control window in a negotiated config. Closes the connection if invalid.
+  void OnNewStreamFlowControlWindow(uint32 new_window);
+
+  // Called in OnConfigNegotiated when we receive a new session level flow
+  // control window in a negotiated config. Closes the connection if invalid.
+  void OnNewSessionFlowControlWindow(uint32 new_window);
+
   // Keep track of highest received byte offset of locally closed streams, while
   // waiting for a definitive final highest offset from the peer.
   std::map<QuicStreamId, QuicStreamOffset>
       locally_closed_streams_highest_offset_;
 
   scoped_ptr<QuicConnection> connection_;
 
   scoped_ptr<QuicHeadersStream> headers_stream_;
 
   // A shim to stand between the connection and the session, to handle stream
@@ skipping 27 matching lines @@
   bool goaway_received_;
   // Whether a GoAway has been sent.
   bool goaway_sent_;
 
   // Indicate if there is pending data for the crypto stream.
   bool has_pending_handshake_;
 
   // Used for session level flow control.
   scoped_ptr<QuicFlowController> flow_controller_;
 
-  // Initial flow control receive window size for new streams.
-  uint32 max_flow_control_receive_window_bytes_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_