Land Recent QUIC Changes.

net/quic/reliable_quic_stream.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.
 //
 // The base class for client/server reliable streams.
 
 #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 
 #include <sys/types.h>
@@ skipping 74 matching lines @@
   uint64 stream_bytes_written() const { return stream_bytes_written_; }
 
   QuicVersion version() const;
 
   void set_fin_sent(bool fin_sent) { fin_sent_ = fin_sent; }
   void set_rst_sent(bool rst_sent) { rst_sent_ = rst_sent; }
 
   // Adjust our flow control windows according to new offset in |frame|.
   virtual void OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame);
 
-  // If our receive window has dropped below the threshold, then send a
-  // WINDOW_UPDATE frame. This is called whenever bytes are consumed from the
-  // sequencer's buffer.
-  void MaybeSendWindowUpdate();
-
   int num_frames_received() const;
 
   int num_duplicate_frames_received() const;
 
   QuicFlowController* flow_controller() { return &flow_controller_; }
 
-  // Called by the stream sequeuncer as bytes are added to the buffer.
-  void AddBytesBuffered(uint64 bytes);
-  // Called by the stream sequeuncer as bytes are removed from the buffer.
-  void RemoveBytesBuffered(uint64 bytes);
+  // Called when we see a frame which could increase the highest offset.
+  void MaybeIncreaseHighestReceivedOffset(uint64 new_offset);
   // Called when bytese are sent to the peer.
   void AddBytesSent(uint64 bytes);
-  // Called by the stream sequeuncer as bytes are consumed from the buffer.
+  // Called by the stream sequencer as bytes are consumed from the buffer.
+  // If our receive window has dropped below the threshold, then send a
+  // WINDOW_UPDATE frame.
   void AddBytesConsumed(uint64 bytes);
 
   // Returns true if the stream is flow control blocked, by the stream flow
   // control window or the connection flow control window.
   bool IsFlowControlBlocked();
 
  protected:
   // Sends as much of 'data' to the connection as the connection will consume,
   // and then buffers any remaining data in queued_data_.
   void WriteOrBufferData(
@@ skipping 41 matching lines @@
     PendingData(string data_in,
                 scoped_refptr<ProxyAckNotifierDelegate> delegate_in);
     ~PendingData();
 
     string data;
     // Delegate that should be notified when the pending data is acked.
     // Can be nullptr.
     scoped_refptr<ProxyAckNotifierDelegate> delegate;
   };
 
-  // Calculates and returns available flow control send window.
-  uint64 SendWindowSize() const;
-
-  // Calculates and returns total number of bytes this stream has received.
-  uint64 TotalReceivedBytes() const;
-
   // Calls MaybeSendBlocked on our flow controller, and connection level flow
   // controller. If we are flow control blocked, marks this stream as write
   // blocked.
   void MaybeSendBlocked();
 
   std::list<PendingData> queued_data_;
 
   QuicStreamSequencer sequencer_;
   QuicStreamId id_;
   QuicSession* session_;
@@ skipping 29 matching lines @@
 
   // The connection level flow controller. Not owned.
   QuicFlowController* connection_flow_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ReliableQuicStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_RELIABLE_QUIC_STREAM_H_