Remove is_deletable_ from QuicStream. Add QuicStream::IsWaitingForAcks

net/quic/core/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 QUIC streams.
 
 // It does not contain the entire interface needed by an application to interact
 // with a QUIC stream.  Some parts of the interface must be obtained by
 // accessing the owning session object.  A subclass of QuicStream
 // connects the object and the application that generates and consumes the data
@@ skipping 74 matching lines @@
 
   // Called by the subclass or the sequencer to reset the stream from this
   // end.
   virtual void Reset(QuicRstStreamErrorCode error);
 
   // Called by the subclass or the sequencer to close the entire connection from
   // this end.
   virtual void CloseConnectionWithDetails(QuicErrorCode error,
                                           const std::string& details);
 
+  // Returns true if this stream is still waiting for acks of sent data.
+  // This will return false if all data has been acked, or if the stream
+  // is no longer interested in data being acked (which happens when
+  // a stream is reset because of an error).
+  bool IsWaitingForAcks() const;
+
   QuicStreamId id() const { return id_; }
 
   QuicRstStreamErrorCode stream_error() const { return stream_error_; }
   QuicErrorCode connection_error() const { return connection_error_; }
 
   bool reading_stopped() const {
     return sequencer_.ignore_read_data() || read_side_closed_;
   }
   bool write_side_closed() const { return write_side_closed_; }
 
@@ skipping 14 matching lines @@
   size_t busy_counter() const { return busy_counter_; }
   void set_busy_counter(size_t busy_counter) { busy_counter_ = busy_counter; }
 
   void set_fin_sent(bool fin_sent) { fin_sent_ = fin_sent; }
   void set_fin_received(bool fin_received) { fin_received_ = fin_received; }
   void set_rst_sent(bool rst_sent) { rst_sent_ = rst_sent; }
 
   void set_rst_received(bool rst_received) { rst_received_ = rst_received; }
   void set_stream_error(QuicRstStreamErrorCode error) { stream_error_ = error; }
 
-  bool is_deletable() const { return is_deletable_; }
-
   // Adjust the flow control window according to new offset in |frame|.
   virtual void OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame);
 
   // Used in Chrome.
   int num_frames_received() const;
   int num_duplicate_frames_received() const;
 
   QuicFlowController* flow_controller() { return &flow_controller_; }
 
   // Called when endpoint receives a frame which could increase the highest
@@ skipping 44 matching lines @@
   // If fin is true: if it is immediately passed on to the session,
   // write_side_closed() becomes true, otherwise fin_buffered_ becomes true.
   void WriteOrBufferData(
       QuicStringPiece data,
       bool fin,
       QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener);
 
   // Adds random padding after the fin is consumed for this stream.
   void AddRandomPaddingAfterFin();
 
-  // Sets this stream as deletable. Delete this stream from zombie stream map if
-  // exists.
-  void SetIsDeletable(bool is_deletable);
-
   // StreamNotifierInterface methods:
   void OnStreamFrameAcked(const QuicStreamFrame& frame,
                           QuicTime::Delta ack_delay_time) override;
   void OnStreamFrameRetransmitted(const QuicStreamFrame& frame) override;
 
  protected:
   // Sends as many bytes in the first |count| buffers of |iov| to the connection
   // as the connection will consume.
   // If |ack_listener| is provided, then it will be notified once all
   // the ACKs for this write have been received.
@@ skipping 107 matching lines @@
   bool fin_received_;
 
   // True if an RST_STREAM has been sent to the session.
   // In combination with fin_sent_, used to ensure that a FIN and/or a
   // RST_STREAM is always sent to terminate the stream.
   bool rst_sent_;
 
   // True if this stream has received a RST_STREAM frame.
   bool rst_received_;
 
-  // True if this stream object may be deleted. Currently, this means this
-  // stream does not have unacked data (including FIN). Please note, this stream
-  // may not finish sending.
-  bool is_deletable_;
-
   // Tracks if the session this stream is running under was created by a
   // server or a client.
   Perspective perspective_;
 
   QuicFlowController flow_controller_;
 
   // The connection level flow controller. Not owned.
   QuicFlowController* connection_flow_controller_;
 
   // Special streams, such as the crypto and headers streams, do not respect
@@ skipping 12 matching lines @@
   // Ack listener of this stream, and it is notified when any of written bytes
   // are acked.
   QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_QUIC_STREAM_H_