Index: net/quic/quic_stream_sequencer.cc |
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc |
index 8f590640237c122784d6cdaa3cec23d78cae5963..b09f3976951a387608033b69179c349aab3ca7a9 100644 |
--- a/net/quic/quic_stream_sequencer.cc |
+++ b/net/quic/quic_stream_sequencer.cc |
@@ -62,9 +62,9 @@ bool QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) { |
DVLOG(1) << "Processing byte offset " << byte_offset; |
size_t bytes_consumed = 0; |
for (size_t i = 0; i < data.Size(); ++i) { |
- bytes_consumed += stream_->ProcessRawData( |
- static_cast<char*>(data.iovec()[i].iov_base), |
- data.iovec()[i].iov_len); |
+ bytes_consumed += |
+ stream_->ProcessRawData(static_cast<char*>(data.iovec()[i].iov_base), |
+ data.iovec()[i].iov_len); |
} |
num_bytes_consumed_ += bytes_consumed; |
stream_->flow_controller()->AddBytesConsumed(bytes_consumed); |
@@ -118,8 +118,7 @@ void QuicStreamSequencer::CloseStreamAtOffset(QuicStreamOffset offset) { |
bool QuicStreamSequencer::MaybeCloseStream() { |
if (!blocked_ && IsClosed()) { |
DVLOG(1) << "Passing up termination, as we've processed " |
- << num_bytes_consumed_ << " of " << close_offset_ |
- << " bytes."; |
+ << num_bytes_consumed_ << " of " << close_offset_ << " bytes."; |
// Technically it's an error if num_bytes_consumed isn't exactly |
// equal, but error handling seems silly at this point. |
stream_->OnFinRead(); |
@@ -136,10 +135,11 @@ int QuicStreamSequencer::GetReadableRegions(iovec* iov, size_t iov_len) { |
size_t index = 0; |
QuicStreamOffset offset = num_bytes_consumed_; |
while (it != frames_.end() && index < iov_len) { |
- if (it->first != offset) return index; |
+ if (it->first != offset) |
+ return index; |
- iov[index].iov_base = static_cast<void*>( |
- const_cast<char*>(it->second.data())); |
+ iov[index].iov_base = |
+ static_cast<void*>(const_cast<char*>(it->second.data())); |
iov[index].iov_len = it->second.size(); |
offset += it->second.size(); |
@@ -157,15 +157,13 @@ int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) { |
size_t frame_offset = 0; |
size_t initial_bytes_consumed = num_bytes_consumed_; |
- while (iov_index < iov_len && |
- it != frames_.end() && |
+ while (iov_index < iov_len && it != frames_.end() && |
it->first == num_bytes_consumed_) { |
int bytes_to_read = min(iov[iov_index].iov_len - iov_offset, |
it->second.size() - frame_offset); |
char* iov_ptr = static_cast<char*>(iov[iov_index].iov_base) + iov_offset; |
- memcpy(iov_ptr, |
- it->second.data() + frame_offset, bytes_to_read); |
+ memcpy(iov_ptr, it->second.data() + frame_offset, bytes_to_read); |
frame_offset += bytes_to_read; |
iov_offset += bytes_to_read; |
@@ -184,8 +182,8 @@ int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) { |
} |
// We've finished copying. If we have a partial frame, update it. |
if (frame_offset != 0) { |
- frames_.insert(make_pair(it->first + frame_offset, |
- it->second.substr(frame_offset))); |
+ frames_.insert( |
+ make_pair(it->first + frame_offset, it->second.substr(frame_offset))); |
frames_.erase(frames_.begin()); |
RecordBytesConsumed(frame_offset); |
} |
@@ -208,7 +206,7 @@ bool QuicStreamSequencer::IsDuplicate(const QuicStreamFrame& frame) const { |
// TODO(pwestin): Is it possible that a new frame contain more data even if |
// the offset is the same? |
return frame.offset < num_bytes_consumed_ || |
- frames_.find(frame.offset) != frames_.end(); |
+ frames_.find(frame.offset) != frames_.end(); |
} |
void QuicStreamSequencer::SetBlockedUntilFlush() { |
@@ -221,8 +219,8 @@ void QuicStreamSequencer::FlushBufferedFrames() { |
while (it != frames_.end()) { |
DVLOG(1) << "Flushing buffered packet at offset " << it->first; |
string* data = &it->second; |
- size_t bytes_consumed = stream_->ProcessRawData(data->c_str(), |
- data->size()); |
+ size_t bytes_consumed = |
+ stream_->ProcessRawData(data->c_str(), data->size()); |
RecordBytesConsumed(bytes_consumed); |
if (MaybeCloseStream()) { |
return; |