Land Recent QUIC changes.

net/quic/quic_stream_sequencer.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/quic_stream_sequencer.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 121 matching lines @@
              << 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_->TerminateFromPeer(half_close_);
     return true;
   }
   return false;
 }
 
-int QuicStreamSequencer::GetReadableRegions(iovec* iov, int iov_len) {
+int QuicStreamSequencer::GetReadableRegions(iovec* iov, size_t iov_len) {
   FrameMap::iterator it = frames_.begin();
-  int index = 0;
-  uint64 offset = num_bytes_consumed_;
+  size_t index = 0;
+  QuicStreamOffset offset = num_bytes_consumed_;
   while (it != frames_.end() && index < iov_len) {
     if (it->first != offset) return index;
 
     iov[index].iov_base = static_cast<void*>(
         const_cast<char*>(it->second.data()));
     iov[index].iov_len = it->second.size();
     offset += it->second.size();
 
     ++index;
     ++it;
   }
   return index;
 }
 
-int QuicStreamSequencer::Readv(const struct iovec* iov, int iov_len) {
+int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) {
   FrameMap::iterator it = frames_.begin();
-  int iov_index = 0;
+  size_t iov_index = 0;
   size_t iov_offset = 0;
   size_t frame_offset = 0;
   size_t initial_bytes_consumed = num_bytes_consumed_;
 
   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);
 
@@ skipping 90 matching lines @@
     } else {
       string new_data = it->second.substr(bytes_consumed);
       frames_.erase(it);
       frames_.insert(make_pair(num_bytes_consumed_, new_data));
       return;
     }
   }
 }
 
 }  // namespace net