commit 0b83e0cca8fa941d28515b90917d2a2f1ca75c1a
author bnc <bnc@google.com> Fri Aug 16 15:56:32 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 19 18:06:50 2019 -0700
tree 5aba2e23f7bb2d3d9c6577e144b39cdaabc702e6
parent 662a3d6f81584c0a883a5f495d91274298c7df8a

Rename QuicSpdyStreamBodyBuffer to QuicSpdyStreamBodyManager.

This class never buffered data, just kept references to data buffered by
QuicStreamSequencer.  And now it also calculates how much data can be marked
consumed, making it deserve a new name.

gfe-relnote: n/a, rename class.
PiperOrigin-RevId: 263864481
Change-Id: If37616b188e12a8711af8f3c425ffe67db7b1147

quic/core/http/quic_spdy_stream.cc

diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc
index e926af7..2471756 100644
--- a/quic/core/http/quic_spdy_stream.cc
+++ b/quic/core/http/quic_spdy_stream.cc
@@ -430,7 +430,7 @@
     return sequencer()->Readv(iov, iov_len);
   }
   size_t bytes_read = 0;
-  sequencer()->MarkConsumed(body_buffer_.ReadBody(iov, iov_len, &bytes_read));
+  sequencer()->MarkConsumed(body_manager_.ReadBody(iov, iov_len, &bytes_read));
 
   return bytes_read;
 }
@@ -440,7 +440,7 @@
   if (!VersionHasDataFrameHeader(transport_version())) {
     return sequencer()->GetReadableRegions(iov, iov_len);
   }
-  return body_buffer_.PeekBody(iov, iov_len);
+  return body_manager_.PeekBody(iov, iov_len);
 }
 
 void QuicSpdyStream::MarkConsumed(size_t num_bytes) {
@@ -450,7 +450,7 @@
     return;
   }
 
-  sequencer()->MarkConsumed(body_buffer_.OnBodyConsumed(num_bytes));
+  sequencer()->MarkConsumed(body_manager_.OnBodyConsumed(num_bytes));
 }
 
 bool QuicSpdyStream::IsDoneReading() const {
@@ -464,7 +464,7 @@
   if (!VersionHasDataFrameHeader(transport_version())) {
     return sequencer()->HasBytesToRead();
   }
-  return body_buffer_.HasBytesToRead();
+  return body_manager_.HasBytesToRead();
 }
 
 void QuicSpdyStream::MarkTrailersConsumed() {
@@ -473,7 +473,7 @@
 
 uint64_t QuicSpdyStream::total_body_bytes_read() const {
   if (VersionHasDataFrameHeader(transport_version())) {
-    return body_buffer_.total_body_bytes_received();
+    return body_manager_.total_body_bytes_received();
   }
   return sequencer()->NumBytesConsumed();
 }
@@ -490,7 +490,7 @@
     return;
   }
 
-  if (body_buffer_.HasBytesToRead()) {
+  if (body_manager_.HasBytesToRead()) {
     OnBodyAvailable();
     return;
   }
@@ -709,7 +709,7 @@
     return;
   }
 
-  if (body_buffer_.HasBytesToRead()) {
+  if (body_manager_.HasBytesToRead()) {
     OnBodyAvailable();
     return;
   }
@@ -794,7 +794,7 @@
     return false;
   }
 
-  sequencer()->MarkConsumed(body_buffer_.OnNonBody(header_length));
+  sequencer()->MarkConsumed(body_manager_.OnNonBody(header_length));
 
   return true;
 }
@@ -802,7 +802,7 @@
 bool QuicSpdyStream::OnDataFramePayload(QuicStringPiece payload) {
   DCHECK(VersionHasDataFrameHeader(transport_version()));
 
-  body_buffer_.OnBody(payload);
+  body_manager_.OnBody(payload);
 
   return true;
 }
@@ -810,7 +810,7 @@
 bool QuicSpdyStream::OnDataFrameEnd() {
   DCHECK(VersionHasDataFrameHeader(transport_version()));
   QUIC_DVLOG(1) << "Reaches the end of a data frame. Total bytes received are "
-                << body_buffer_.total_body_bytes_received();
+                << body_manager_.total_body_bytes_received();
   return true;
 }
 
@@ -874,7 +874,7 @@
     return false;
   }
 
-  sequencer()->MarkConsumed(body_buffer_.OnNonBody(header_length));
+  sequencer()->MarkConsumed(body_manager_.OnNonBody(header_length));
 
   qpack_decoded_headers_accumulator_ =
       QuicMakeUnique<QpackDecodedHeadersAccumulator>(
@@ -895,7 +895,7 @@
 
   const bool success = qpack_decoded_headers_accumulator_->Decode(payload);
 
-  sequencer()->MarkConsumed(body_buffer_.OnNonBody(payload.size()));
+  sequencer()->MarkConsumed(body_manager_.OnNonBody(payload.size()));
 
   if (!success) {
     // TODO(124216424): Use HTTP_QPACK_DECOMPRESSION_FAILED error code.
@@ -942,7 +942,7 @@
   // TODO(renjietang): Check max push id and handle errors.
   spdy_session_->OnPushPromise(id(), push_id);
   sequencer()->MarkConsumed(
-      body_buffer_.OnNonBody(header_length + push_id_length));
+      body_manager_.OnNonBody(header_length + push_id_length));
 
   qpack_decoded_headers_accumulator_ =
       QuicMakeUnique<QpackDecodedHeadersAccumulator>(
@@ -969,7 +969,7 @@
   QUIC_DVLOG(1) << "Discarding " << header_length
                 << " byte long frame header of frame of unknown type "
                 << frame_type << ".";
-  sequencer()->MarkConsumed(body_buffer_.OnNonBody(header_length));
+  sequencer()->MarkConsumed(body_manager_.OnNonBody(header_length));
   return true;
 }
 
@@ -977,7 +977,7 @@
   // Ignore unknown frames, but consume frame payload.
   QUIC_DVLOG(1) << "Discarding " << payload.size()
                 << " bytes of payload of frame of unknown type.";
-  sequencer()->MarkConsumed(body_buffer_.OnNonBody(payload.size()));
+  sequencer()->MarkConsumed(body_manager_.OnNonBody(payload.size()));
   return true;
 }