Land Recent QUIC Changes.

net/quic/reliable_quic_stream.cc

 // 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.
 
 #include "net/quic/reliable_quic_stream.h"
 
 #include "net/quic/quic_session.h"
 #include "net/quic/quic_spdy_decompressor.h"
 #include "net/spdy/write_blocked_list.h"
 
@@ skipping 237 matching lines @@
       queued_data_.front().erase(0, consumed_data.bytes_consumed);
       break;
     }
   }
 }
 
 QuicConsumedData ReliableQuicStream::WriteDataInternal(
     StringPiece data, bool fin) {
   struct iovec iov = {const_cast<char*>(data.data()),
                       static_cast<size_t>(data.size())};
-  return WritevDataInternal(&iov, 1, fin);
+  return WritevDataInternal(&iov, 1, fin, NULL);
 }
 
-QuicConsumedData ReliableQuicStream::WritevDataInternal(const struct iovec* iov,
-                                                        int iov_count,
-                                                        bool fin) {
+QuicConsumedData ReliableQuicStream::WritevDataInternal(
+    const struct iovec* iov,
+    int iov_count,
+    bool fin,
+    QuicAckNotifier::DelegateInterface* ack_notifier_delegate) {
   if (write_side_closed_) {
     DLOG(ERROR) << ENDPOINT << "Attempt to write when the write side is closed";
     return QuicConsumedData(0, false);
   }
 
   size_t write_length = 0u;
   for (int i = 0; i < iov_count; ++i) {
     write_length += iov[i].iov_len;
   }
-  QuicConsumedData consumed_data =
-      session()->WritevData(id(), iov, iov_count, stream_bytes_written_, fin);
+  QuicConsumedData consumed_data = session()->WritevData(
+      id(), iov, iov_count, stream_bytes_written_, fin, ack_notifier_delegate);
   stream_bytes_written_ += consumed_data.bytes_consumed;
   if (consumed_data.bytes_consumed == write_length) {
     if (fin && consumed_data.fin_consumed) {
       fin_sent_ = true;
       CloseWriteSide();
     } else if (fin && !consumed_data.fin_consumed) {
       session_->MarkWriteBlocked(id(), EffectivePriority());
     }
   } else {
     session_->MarkWriteBlocked(id(), EffectivePriority());
@@ skipping 23 matching lines @@
   if (id() == kCryptoStreamId) {
     // The crypto stream does not use compression.
     return ProcessData(data, data_len);
   }
 
   uint32 total_bytes_consumed = 0;
   if (headers_id_ == 0u) {
     total_bytes_consumed += StripPriorityAndHeaderId(data, data_len);
     data += total_bytes_consumed;
     data_len -= total_bytes_consumed;
-    if (data_len == 0 || !session_->connection()->connected()) {
+    if (data_len == 0 || total_bytes_consumed == 0) {
       return total_bytes_consumed;
     }
   }
   DCHECK_NE(0u, headers_id_);
 
   // Once the headers are finished, we simply pass the data through.
   if (headers_decompressed_) {
     // Some buffered header data remains.
     if (!decompressed_headers_.empty()) {
       ProcessHeaderData();
@@ skipping 188 matching lines @@
   if (data_len > 0 && headers_id_ == 0u) {
     // The headers ID has not yet been read.  Strip it from the beginning of
     // the data stream.
     total_bytes_parsed += StripUint32(
         data, data_len, &headers_id_and_priority_buffer_, &headers_id_);
   }
   return total_bytes_parsed;
 }
 
 }  // namespace net